diff --git a/vars/distro_install.yml b/vars/distro_install.yml index f6e62c1f..daf2bb0c 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -24,7 +24,6 @@ nova_package_list: |- nova_services['nova-spicehtml5proxy']['group'] in group_names or nova_services['nova-serialconsole-proxy']['group'] in group_names %} {% if nova_console_type == 'novnc' %} - {% set _ = packages.extend(nova_novnc_distro_packages) %} {% set _ = packages.extend(nova_service_extra_distro_packages['novnc']) %} {% endif %} {% if nova_console_type == 'spice' %} diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index bec91889..fb1c112d 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -55,12 +55,6 @@ nova_service_extra_distro_packages: serialconsole: - openstack-nova-serialproxy -nova_novnc_distro_packages: - - js-jquery - - js-underscore - - librabbitmq - - libyaml - nova_compute_barbican_distro_packages: - cryptsetup diff --git a/vars/source_install.yml b/vars/source_install.yml index 6eff93ec..70e973fc 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -20,13 +20,6 @@ # nova_package_list: |- {% set packages = nova_distro_packages %} - {% if nova_services['nova-novncproxy']['group'] in group_names or - nova_services['nova-spicehtml5proxy']['group'] in group_names or - nova_services['nova-serialconsole-proxy']['group'] in group_names %} - {% if nova_console_type == 'novnc' %} - {% set _ = packages.extend(nova_novnc_distro_packages) %} - {% endif %} - {% endif %} {% if nova_services['nova-compute']['group'] in group_names %} {% if nova_virt_type in ['kvm', 'qemu'] %} {% set _ = packages.extend(nova_compute_kvm_distro_packages) %} diff --git a/vars/suse.yml b/vars/suse.yml index a8c15f52..ebe0e13e 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -55,9 +55,6 @@ nova_service_extra_distro_packages: serialconsole: - openstack-nova-serialproxy -nova_novnc_distro_packages: - - python-websockify - nova_compute_barbican_distro_packages: - cryptsetup diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index 6242e507..4878e0ba 100644 --- a/vars/ubuntu.yml +++ b/vars/ubuntu.yml @@ -57,14 +57,6 @@ nova_service_extra_distro_packages: serialconsole: - openstack-nova-serialproxy -nova_novnc_distro_packages: - - libjs-jquery - - libjs-sphinxdoc - - libjs-underscore - - libjs-swfobject - - librabbitmq4 - - libyaml-0-2 - nova_compute_barbican_distro_packages: - cryptsetup