Drop usage of nova_spice_distro_packages in the role
There was a commit 3 years ago which switched to installing SPICE from source rather than from packages. It also included a section which would 'remove' and 'cleanup' packages for SPICE which was not removed. With time, it looks like we've added it to the list of things to install, only to uninstall it in the next task. This removes all of this extra cruft and further removes our dependency on EPEL. Change-Id: I9bbe109d50040bbc02b194f9486ab581a6cc51a9
This commit is contained in:
parent
eda296a37e
commit
0a120c1c75
@ -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"
|
||||
|
@ -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'] %}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user