openstack/openstack-ansible-os_horizon
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: Ifdff299a81cbba90cf819c9a628650c8b1be3d6a
This commit is contained in:
Jesse Pretorius 2018-10-30 19:21:05 +00:00
parent 348e346adb
commit 0fcfbf374c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasks/horizon_install_source.yml
View File

@ -65,7 +65,6 @@
vars: vars:
venv_build_distro_package_list: "{{ horizon_devel_distro_packages }}" venv_build_distro_package_list: "{{ horizon_devel_distro_packages }}"
venv_install_destination_path: "{{ horizon_bin | dirname }}" venv_install_destination_path: "{{ horizon_bin | dirname }}"
venv_install_distro_package_list: "{{ horizon_distro_packages }}"
venv_pip_install_args: "{{ horizon_pip_install_args }}" venv_pip_install_args: "{{ horizon_pip_install_args }}"
venv_pip_packages: >- venv_pip_packages: >-
{{ horizon_pip_packages + horizon_optional_pip_packages + {{ horizon_pip_packages + horizon_optional_pip_packages +

3
vars/source_install.yml
View File

@ -12,7 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
horizon_package_list: "{{ horizon_distro_packages + horizon_devel_distro_packages }}"
horizon_package_list: "{{ horizon_distro_packages }}"
_horizon_bin: "/openstack/venvs/horizon-{{ horizon_venv_tag }}/bin" _horizon_bin: "/openstack/venvs/horizon-{{ horizon_venv_tag }}/bin"
_horizon_lib_dir: "{{ _horizon_bin | dirname }}/lib/python2.7/dist-packages" _horizon_lib_dir: "{{ _horizon_bin | dirname }}/lib/python2.7/dist-packages"
horizon_python_lib_dir: "{{ _horizon_lib_dir }}" horizon_python_lib_dir: "{{ _horizon_lib_dir }}"