vars: package cleanup
- Created nova_compute_packages for compute common packages All operating systems: - bridge-utils because os-vif uses iproute2 - postgres headers because OpenStack doesn't support it - python libraries as they are already installed - python-openstackclient as it's not used in run-time Debian removals: - qemu-kvm because it's just a legacy wrapper for qemu-system-x86 - qemu-utils recommended by qemu-system-x86 - qemu-system-{arm,mips,misc,ppc,sparc,x86} required by qemu-system - qemu-{system,user,utils} required by qemu - vlan as nova no longer uses vconfig - python3-{guestfs,libvirt} as python3 support is not there yet RedHat removals: - libvirt-daemon-config-{nwfilter,qemu} required by libvirt-daemon-kvm - qemu-img-ev required by qemu-kvm-ev - iscsi-initiator-utils required by libvirt-daemon-driver-storage-iscsi SUSE removals: - open-iscsi required by libvirt-daemon-driver-storage-iscsi - libvirt-daemon-driver-storage-core required by libvirt-daemon-driver-storage-* - device-mapper required by libvirt-daemon-driver-storage-disk - nfs-utils required by libvirt-daemon-driver-storage-core - qemu-block-{curl,dmg,ssh} as that block storage driver is not used Change-Id: If81939f95042460dd83234160f44426692189376
This commit is contained in:
parent
417ec1a296
commit
2e1647ea18
@ -466,15 +466,10 @@ nova_compute_ironic_pip_packages:
|
|||||||
|
|
||||||
# Common pip packages
|
# Common pip packages
|
||||||
nova_pip_packages:
|
nova_pip_packages:
|
||||||
- cryptography
|
|
||||||
- keystonemiddleware
|
|
||||||
- nova
|
- nova
|
||||||
- osprofiler
|
- osprofiler
|
||||||
- PyMySQL
|
- PyMySQL
|
||||||
- python-keystoneclient
|
|
||||||
- python-memcached
|
- python-memcached
|
||||||
- python-novaclient
|
|
||||||
- python-openstackclient
|
|
||||||
- systemd-python
|
- systemd-python
|
||||||
|
|
||||||
# Specific pip packages provided by the user
|
# Specific pip packages provided by the user
|
||||||
|
@ -21,17 +21,12 @@ libvirt_service_name: libvirtd
|
|||||||
|
|
||||||
# Common apt packages
|
# Common apt packages
|
||||||
nova_distro_packages:
|
nova_distro_packages:
|
||||||
- genisoimage
|
|
||||||
- git
|
|
||||||
- iptables
|
- iptables
|
||||||
- libpython2.7
|
|
||||||
- python-openstackclient
|
|
||||||
|
|
||||||
nova_devel_distro_packages:
|
nova_devel_distro_packages:
|
||||||
- libpq-dev
|
- git
|
||||||
- libsystemd-dev
|
- libsystemd-dev
|
||||||
- libxml2-dev
|
- libxml2-dev
|
||||||
- python-httplib2
|
|
||||||
|
|
||||||
nova_service_distro_packages:
|
nova_service_distro_packages:
|
||||||
- python3-nova
|
- python3-nova
|
||||||
@ -51,6 +46,16 @@ nova_service_extra_distro_packages:
|
|||||||
serialconsole:
|
serialconsole:
|
||||||
- openstack-nova-serialproxy
|
- openstack-nova-serialproxy
|
||||||
|
|
||||||
|
nova_compute_packages:
|
||||||
|
- dosfstools
|
||||||
|
- genisoimage
|
||||||
|
- kpartx
|
||||||
|
- multipath-tools
|
||||||
|
- nfs-common
|
||||||
|
- open-iscsi
|
||||||
|
- python3-guestfs
|
||||||
|
- sysfsutils
|
||||||
|
|
||||||
nova_compute_barbican_distro_packages:
|
nova_compute_barbican_distro_packages:
|
||||||
- cryptsetup
|
- cryptsetup
|
||||||
|
|
||||||
@ -59,44 +64,15 @@ nova_compute_oslomsg_amqp1_distro_packages:
|
|||||||
- libsasl2-modules
|
- libsasl2-modules
|
||||||
- sasl2-bin
|
- sasl2-bin
|
||||||
|
|
||||||
# the qemu-system-.*, qemu-block-extra, qemu-utils, qemu-user packages are explictly listed
|
|
||||||
# for consistent upgrades (they will all be to the same version)
|
|
||||||
nova_compute_kvm_distro_packages:
|
nova_compute_kvm_distro_packages:
|
||||||
- bridge-utils
|
- libvirt-daemon
|
||||||
- genisoimage
|
- libvirt-daemon-system
|
||||||
- kpartx
|
|
||||||
- "{{ (ansible_distribution == 'Debian') | ternary('libvirt-daemon-system', 'libvirt-bin') }}"
|
|
||||||
- netcat-openbsd
|
|
||||||
- open-iscsi
|
|
||||||
- python-guestfs
|
|
||||||
- python3-guestfs
|
|
||||||
- python-libvirt
|
|
||||||
- python3-libvirt
|
- python3-libvirt
|
||||||
- qemu
|
- qemu
|
||||||
- qemu-utils
|
|
||||||
- sysfsutils
|
|
||||||
- vlan
|
|
||||||
- nfs-common
|
|
||||||
- dosfstools
|
|
||||||
- multipath-tools
|
|
||||||
- qemu-system
|
|
||||||
- qemu-system-arm
|
|
||||||
- qemu-system-mips
|
|
||||||
- qemu-system-ppc
|
|
||||||
- qemu-system-sparc
|
|
||||||
- qemu-system-x86
|
|
||||||
- qemu-system-misc
|
|
||||||
- qemu-block-extra
|
- qemu-block-extra
|
||||||
- qemu-utils
|
|
||||||
- qemu-user
|
|
||||||
- qemu-kvm
|
|
||||||
- qemu-efi
|
|
||||||
- ovmf
|
|
||||||
|
|
||||||
nova_compute_kvm_packages_to_symlink:
|
nova_compute_kvm_packages_to_symlink:
|
||||||
- python-libvirt
|
|
||||||
- python3-libvirt
|
- python3-libvirt
|
||||||
- python-guestfs
|
|
||||||
- python3-guestfs
|
- python3-guestfs
|
||||||
|
|
||||||
nova_compute_ksm_packages:
|
nova_compute_ksm_packages:
|
||||||
|
@ -34,6 +34,7 @@ nova_package_list: |-
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if nova_services['nova-compute']['group'] in group_names %}
|
{% if nova_services['nova-compute']['group'] in group_names %}
|
||||||
|
{% set _ = packages.extend(nova_compute_packages) %}
|
||||||
{% if nova_virt_type in ['kvm', 'qemu'] %}
|
{% if nova_virt_type in ['kvm', 'qemu'] %}
|
||||||
{% set _ = packages.extend(nova_compute_kvm_distro_packages) %}
|
{% set _ = packages.extend(nova_compute_kvm_distro_packages) %}
|
||||||
{% set _ = packages.extend(nova_service_extra_distro_packages['kvm']) %}
|
{% set _ = packages.extend(nova_service_extra_distro_packages['kvm']) %}
|
||||||
|
@ -20,25 +20,20 @@ libvirt_service_name: libvirtd
|
|||||||
|
|
||||||
# Common yum packages
|
# Common yum packages
|
||||||
nova_distro_packages:
|
nova_distro_packages:
|
||||||
- genisoimage
|
|
||||||
- git
|
|
||||||
- iptables
|
- iptables
|
||||||
|
- systemd-python
|
||||||
|
|
||||||
nova_devel_distro_packages:
|
nova_devel_distro_packages:
|
||||||
|
- git
|
||||||
- libxml2-devel
|
- libxml2-devel
|
||||||
- postgresql-devel
|
|
||||||
- systemd-devel
|
|
||||||
- which
|
|
||||||
|
|
||||||
nova_service_distro_packages:
|
nova_service_distro_packages:
|
||||||
- openstack-nova-api
|
- openstack-nova-api
|
||||||
- openstack-nova-conductor
|
- openstack-nova-conductor
|
||||||
- openstack-nova-console
|
|
||||||
- openstack-nova-scheduler
|
- openstack-nova-scheduler
|
||||||
- python-memcached
|
- python-memcached
|
||||||
- python-novaclient
|
|
||||||
- python2-PyMySQL
|
- python2-PyMySQL
|
||||||
- systemd-python
|
- systemd-devel
|
||||||
|
|
||||||
nova_service_extra_distro_packages:
|
nova_service_extra_distro_packages:
|
||||||
kvm:
|
kvm:
|
||||||
@ -51,27 +46,23 @@ nova_service_extra_distro_packages:
|
|||||||
serialconsole:
|
serialconsole:
|
||||||
- openstack-nova-serialproxy
|
- openstack-nova-serialproxy
|
||||||
|
|
||||||
|
nova_compute_packages:
|
||||||
|
- dosfstools
|
||||||
|
- genisoimage
|
||||||
|
- kpartx
|
||||||
|
- python-libguestfs
|
||||||
|
- sysfsutils
|
||||||
|
|
||||||
nova_compute_barbican_distro_packages:
|
nova_compute_barbican_distro_packages:
|
||||||
- cryptsetup
|
- cryptsetup
|
||||||
|
|
||||||
nova_compute_kvm_distro_packages:
|
nova_compute_kvm_distro_packages:
|
||||||
- bridge-utils
|
|
||||||
- device-mapper-multipath
|
|
||||||
- dosfstools
|
|
||||||
- genisoimage
|
|
||||||
- iscsi-initiator-utils
|
|
||||||
- kpartx
|
|
||||||
- libvirt-daemon-config-nwfilter
|
|
||||||
- libvirt-daemon-kvm
|
- libvirt-daemon-kvm
|
||||||
- libvirt-daemon-driver-qemu
|
|
||||||
- libvirt-client
|
|
||||||
- nc
|
|
||||||
- "qemu-kvm{% if ansible_distribution_major_version|int <= 7 %}-ev{% endif %}"
|
- "qemu-kvm{% if ansible_distribution_major_version|int <= 7 %}-ev{% endif %}"
|
||||||
- libvirt-python
|
- libvirt-python
|
||||||
- nfs-utils
|
- nfs-utils
|
||||||
- python-libguestfs
|
- python-libguestfs
|
||||||
- "qemu-img{% if ansible_distribution_major_version|int <= 7 %}-ev{% endif %}"
|
- "qemu-img{% if ansible_distribution_major_version|int <= 7 %}-ev{% endif %}"
|
||||||
- sysfsutils
|
|
||||||
- "{{ (ansible_architecture == 'aarch64') | ternary('AAVMF', 'OVMF') }}"
|
- "{{ (ansible_architecture == 'aarch64') | ternary('AAVMF', 'OVMF') }}"
|
||||||
|
|
||||||
nova_compute_kvm_packages_to_symlink:
|
nova_compute_kvm_packages_to_symlink:
|
||||||
@ -82,6 +73,5 @@ nova_compute_ksm_packages:
|
|||||||
- ksmtuned
|
- ksmtuned
|
||||||
|
|
||||||
nova_compute_oslomsg_amqp1_distro_packages:
|
nova_compute_oslomsg_amqp1_distro_packages:
|
||||||
- cyrus-sasl-lib
|
|
||||||
- cyrus-sasl-plain
|
- cyrus-sasl-plain
|
||||||
- cyrus-sasl-md5
|
- cyrus-sasl-md5
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
nova_package_list: |-
|
nova_package_list: |-
|
||||||
{% set packages = nova_distro_packages %}
|
{% set packages = nova_distro_packages %}
|
||||||
{% if nova_services['nova-compute']['group'] in group_names %}
|
{% if nova_services['nova-compute']['group'] in group_names %}
|
||||||
|
{% set _ = packages.extend(nova_compute_packages) %}
|
||||||
{% if nova_virt_type in ['kvm', 'qemu'] %}
|
{% if nova_virt_type in ['kvm', 'qemu'] %}
|
||||||
{% set _ = packages.extend(nova_compute_kvm_distro_packages) %}
|
{% set _ = packages.extend(nova_compute_kvm_distro_packages) %}
|
||||||
{% if nova_compute_ksm_enabled %}
|
{% if nova_compute_ksm_enabled %}
|
||||||
|
@ -21,15 +21,11 @@ libvirt_service_name: libvirtd
|
|||||||
|
|
||||||
# Common yum packages
|
# Common yum packages
|
||||||
nova_distro_packages:
|
nova_distro_packages:
|
||||||
- genisoimage
|
|
||||||
- git-core
|
|
||||||
- iptables
|
- iptables
|
||||||
- python3-openstackclient
|
|
||||||
|
|
||||||
nova_devel_distro_packages:
|
nova_devel_distro_packages:
|
||||||
|
- git-core
|
||||||
- libxml2-devel
|
- libxml2-devel
|
||||||
- postgresql-devel
|
|
||||||
- python-httplib2
|
|
||||||
- systemd-devel
|
- systemd-devel
|
||||||
|
|
||||||
nova_service_distro_packages:
|
nova_service_distro_packages:
|
||||||
@ -37,7 +33,6 @@ nova_service_distro_packages:
|
|||||||
- openstack-nova-conductor
|
- openstack-nova-conductor
|
||||||
- openstack-nova-scheduler
|
- openstack-nova-scheduler
|
||||||
- python-memcached
|
- python-memcached
|
||||||
- python-novaclient
|
|
||||||
- python-PyMySQL
|
- python-PyMySQL
|
||||||
- python-systemd
|
- python-systemd
|
||||||
|
|
||||||
@ -50,6 +45,13 @@ nova_service_extra_distro_packages:
|
|||||||
serialconsole:
|
serialconsole:
|
||||||
- openstack-nova-serialproxy
|
- openstack-nova-serialproxy
|
||||||
|
|
||||||
|
nova_compute_packages:
|
||||||
|
- dosfstools
|
||||||
|
- genisoimage
|
||||||
|
- kpartx
|
||||||
|
- python3-libguestfs
|
||||||
|
- sysfsutils
|
||||||
|
|
||||||
nova_compute_barbican_distro_packages:
|
nova_compute_barbican_distro_packages:
|
||||||
- cryptsetup
|
- cryptsetup
|
||||||
|
|
||||||
@ -72,8 +74,6 @@ nova_compute_kvm_distro_packages:
|
|||||||
- libvirt-daemon-driver-storage-scsi
|
- libvirt-daemon-driver-storage-scsi
|
||||||
- netcat-openbsd
|
- netcat-openbsd
|
||||||
- qemu-kvm
|
- qemu-kvm
|
||||||
- qemu-block-curl
|
|
||||||
- qemu-block-dmg
|
|
||||||
- qemu-block-iscsi
|
- qemu-block-iscsi
|
||||||
- qemu-block-rbd
|
- qemu-block-rbd
|
||||||
- qemu-block-ssh
|
- qemu-block-ssh
|
||||||
@ -96,6 +96,5 @@ nova_compute_ksm_packages:
|
|||||||
- qemu-ksm
|
- qemu-ksm
|
||||||
|
|
||||||
nova_compute_oslomsg_amqp1_distro_packages:
|
nova_compute_oslomsg_amqp1_distro_packages:
|
||||||
- cyrus-sasl
|
|
||||||
- cyrus-sasl-plain
|
- cyrus-sasl-plain
|
||||||
- cyrus-sasl-digestmd5
|
- cyrus-sasl-digestmd5
|
||||||
|
Loading…
Reference in New Issue
Block a user