diff --git a/tasks/nova_install.yml b/tasks/nova_install.yml index 4eff4295..1c639171 100644 --- a/tasks/nova_install.yml +++ b/tasks/nova_install.yml @@ -27,22 +27,6 @@ update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}" cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}" -- name: Remove known problem packages for the Spice console - package: - name: "{{ item }}" - state: absent - register: remove_packages - until: remove_packages|success - retries: 5 - delay: 2 - with_items: "{{ nova_spice_distro_packages }}" - when: - - "nova_services['nova-spicehtml5proxy']['group'] in group_names" - - nova_console_type == "spice" - tags: - - nova-apt-packages - - nova-spice-apt-packages - - name: Create developer mode constraint file copy: dest: "/opt/developer-pip-constraints.txt" diff --git a/vars/main.yml b/vars/main.yml index a6bc63dc..f8a76514 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -26,9 +26,6 @@ nova_package_list: |- {% if nova_console_type == 'novnc' %} {% set _ = packages.extend(nova_novnc_distro_packages) %} {% endif %} - {% if nova_console_type == 'spice' %} - {% set _ = packages.extend(nova_spice_distro_packages) %} - {% endif %} {% endif %} {% if nova_services['nova-compute']['group'] in group_names %} {% if nova_virt_type in ['kvm', 'qemu'] %} diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 9e8c1c45..0b0da943 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -27,10 +27,6 @@ nova_distro_packages: - which - libxml2-devel -# Spice console yum packages -nova_spice_distro_packages: - - spice-html5 - nova_novnc_distro_packages: - js-jquery - js-underscore diff --git a/vars/suse-42.yml b/vars/suse-42.yml index 8266937b..064e6363 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -28,10 +28,6 @@ nova_distro_packages: - which - libxml2-devel -# Spice console zypper packages -nova_spice_distro_packages: - - libspice-controller0 - nova_novnc_distro_packages: - python-websockify diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index e9f21114..8f6fc19f 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -27,10 +27,6 @@ nova_distro_packages: - iptables - libxml2-dev -# Spice console apt packages -nova_spice_distro_packages: - - spice-html5 - nova_novnc_distro_packages: - libjs-jquery - libjs-sphinxdoc