Merge "Move novnc python package install into common venv_build task"

tasks/consoles/nova_console_novnc_install.yml

@@ -57,28 +57,6 @@
   tags:
     - nova-novnc-git
 
-- name: Install pip packages
-  pip:
-    name: "{{ nova_novnc_pip_packages }}"
-    state: "{{ nova_pip_package_state }}"
-    virtualenv: "{{ nova_bin | dirname }}"
-    virtualenv_site_packages: "no"
-    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 is success
-  retries: 5
-  delay: 2
-  when:
-    - nova_get_venv | failed or nova_get_venv | skipped
-  notify:
-    - Manage LB
-    - Restart nova services
-  tags:
-    - nova-pip-packages
-
 - include_tasks: nova_console_novnc_ssl.yml
   when:
     - nova_console_user_ssl_cert is defined

tasks/nova_install_source.yml

@@ -44,7 +44,9 @@
     venv_install_destination_path: "{{ nova_bin | dirname }}"
     venv_install_distro_package_list: "{{ nova_distro_packages }}"
     venv_pip_install_args: "{{ nova_pip_install_args }}"
-    venv_pip_packages: "{{ nova_pip_packages }}"
+    venv_pip_packages: >-
+      {{ nova_pip_packages +
+         ((nova_services['nova-novncproxy']['group'] in group_names) and (nova_console_type == 'novnc')) | ternary(nova_novnc_pip_packages, []) }}
     venv_facts_when_changed:
       - section: "nova"
         option: "need_service_restart"