Merge "Allow the developer constraints to be adjusted"

openstack/openstack-ansible-os_nova

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2017年05月31日 17:45:43 +00:00

committed by Gerrit Code Review

parent f83215bfcb b17d8808a5

commit 7879e17e41

7 changed files with 17 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/consoles/nova_console_novnc_install.yml

View File

@@ -42,7 +42,10 @@

state:"{{ nova_pip_package_state }}"

virtualenv:"{{ nova_bin | dirname }}"

virtualenv_site_packages:"no"

extra_args:"{{ pip_install_options|default('') }}"

extra_args:>-

 {{ nova_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}

 {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}

{{ pip_install_options|default('') }}

register:install_packages

until:install_packages|success

retries:5

2
tasks/drivers/ironic/nova_compute_ironic.yml

View File

@@ -20,7 +20,7 @@

virtualenv:"{{ nova_bin | dirname }}"

virtualenv_site_packages:"no"

extra_args:>-

{{ nova_developer_mode | ternary('--constraint /opt/developer-pip-constraints.txt', '') }}

 {{ nova_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}

 {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}

{{ pip_install_options | default('') }}

register:install_packages

5
tasks/drivers/kvm/nova_compute_kvm_install.yml

View File

@@ -61,7 +61,10 @@

state:"{{ nova_pip_package_state }}"

virtualenv:"{{ nova_bin | dirname }}"

virtualenv_site_packages:"no"

extra_args:"{{ pip_install_options|default('') }}"

extra_args:>-

 {{ nova_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}

 {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}

{{ pip_install_options|default('') }}

register:install_packages

until:install_packages|success

retries:5

2
tasks/drivers/lxd/nova_compute_lxd.yml

View File

@@ -20,7 +20,7 @@

virtualenv:"{{ nova_bin | dirname }}"

virtualenv_site_packages:"no"

extra_args:>-

{{ nova_developer_mode | ternary('--constraint /opt/developer-pip-constraints.txt', '') }}

 {{ nova_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}

 {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}

{{ pip_install_options | default('') }}

register:install_packages

5
tasks/drivers/powervm/nova_compute_powervm.yml

View File

@@ -19,7 +19,10 @@

state:"{{ nova_pip_package_state }}"

virtualenv:"{{ nova_bin | dirname }}"

virtualenv_site_packages:"no"

extra_args:"{{ pip_install_options|default('') }}"

extra_args:>-

 {{ nova_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}

 {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}

{{ pip_install_options|default('') }}

register:install_packages

until:install_packages|success

retries:5

3
tasks/nova_install.yml

View File

@@ -48,6 +48,7 @@

name:"{{ nova_requires_pip_packages }}"

state:"{{ nova_pip_package_state }}"

extra_args:>-

 {{ nova_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}

 {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}

{{ pip_install_options | default('') }}

register:install_packages

@@ -115,7 +116,7 @@

virtualenv:"{{ nova_bin | dirname }}"

virtualenv_site_packages:"no"

extra_args:>-

{{ nova_developer_mode | ternary('--constraint /opt/developer-pip-constraints.txt', '') }}

 {{ nova_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}

 {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}

{{ pip_install_options | default('') }}

register:install_packages

2
tasks/nova_placement.yml

View File

@@ -20,7 +20,7 @@

virtualenv:"{{ nova_bin | dirname }}"

virtualenv_site_packages:"no"

extra_args:>-

{{ nova_developer_mode | ternary('--constraint /opt/developer-pip-constraints.txt', '') }}

 {{ nova_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}

 {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}

{{ pip_install_options | default('') }}

register:install_packages