openstack/openstack-ansible-os_aodh
Code Issues Proposed changes

Remove unnecessary package install duplication

Browse Source 
Currently the devel packages are installed everywhere,
but they only need to be where the wheels are built.

Also, there is already a task to install the packages
needed on the target hosts when installing - so we do
not need to give the same list to the venv install role
because they will already have been installed.

Change-Id: I59394c17c8a5475cc41b583268e45df1da561e7d
This commit is contained in:
Jesse Pretorius 2018-10-30 19:16:06 +00:00
parent fb24564532
commit d2dfb8cdbd
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasks/aodh_install_source.yml
View File

@ -41,7 +41,6 @@
vars: vars:
venv_build_distro_package_list: "{{ aodh_devel_distro_packages }}" venv_build_distro_package_list: "{{ aodh_devel_distro_packages }}"
venv_install_destination_path: "{{ aodh_bin | dirname }}" venv_install_destination_path: "{{ aodh_bin | dirname }}"
venv_install_distro_package_list: "{{ aodh_distro_packages }}"
venv_pip_install_args: "{{ aodh_pip_install_args }}" venv_pip_install_args: "{{ aodh_pip_install_args }}"
venv_pip_packages: "{{ (aodh_oslomsg_amqp1_enabled | bool) | ternary(aodh_pip_packages + aodh_optional_oslomsg_amqp1_pip_packages, aodh_pip_packages) }}" venv_pip_packages: "{{ (aodh_oslomsg_amqp1_enabled | bool) | ternary(aodh_pip_packages + aodh_optional_oslomsg_amqp1_pip_packages, aodh_pip_packages) }}"
venv_facts_when_changed: venv_facts_when_changed:

2
vars/source_install.yml
View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
aodh_package_list: |- aodh_package_list: |-
{% set packages = (aodh_distro_packages + aodh_devel_distro_packages) %} {% set packages = (aodh_distro_packages) %}
{% if aodh_oslomsg_amqp1_enabled | bool %} {% if aodh_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(aodh_oslomsg_amqp1_distro_packages) %} {% set _ = packages.extend(aodh_oslomsg_amqp1_distro_packages) %}
{% endif %} {% endif %}