openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Rename package lists (and related vars) appropriately

Browse Source 
In order to make it easier to differentiate between the lists of
python packages, distribution packages, downloaded packages,
package pins and other similar variables the variable names are
being changed to ensure that they have a more explicit suffix
that defines the purpose and makes the naming more consistent.

This is to facilitate a lookup plugin which will be able to look
up all the package lists and present them as a consolidated piece
of data which may be used for artifact preparation.

Change-Id: I19151dabeb96392cbceb63506d4a7e64da6119f3
This commit is contained in:
Jesse Pretorius 2016-08-30 19:54:11 +01:00
parent f6f6299983
commit 57cc173e6d
5 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
releasenotes/notes/var-deprecations-417d87b9d386466a.yaml
View File

@ -1,12 +1,11 @@
---
deprecations:
upgrade:
- |
The following variables have been renamed in order to make the variable
names neutral for multiple operating systems.
* nova_apt_packages -> nova_packages
* nova_spice_apt_packages -> nova_spice_packages
* nova_novnc_apt_packages -> nova_novnc_packages
* nova_compute_kvm_apt_packages -> nova_compute_kvm_package
* nova_apt_packages -> nova_distro_packages
* nova_spice_apt_packages -> nova_spice_distro_packages
* nova_novnc_apt_packages -> nova_novnc_distro_packages
* nova_compute_kvm_apt_packages -> nova_compute_kvm_distro_packages
The old variable names will be removed in the Ocata cycle.

2
tasks/nova_compute_powervm_install.yml
View File

@ -66,7 +66,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ nova_compute_powervm_packages }}"
with_items: "{{ nova_compute_powervm_distro_packages }}"
tags:
- nova-apt-packages
- nova-compute-powervm-apt-packages

10
tasks/nova_install_apt.yml
View File

@ -61,7 +61,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ nova_packages | deprecated(nova_apt_packages, 'nova_apt_packages', 'nova_packages', 'Ocata') }}"
with_items: "{{ nova_distro_packages }}"
tags:
- nova-install
- nova-apt-packages
@ -74,7 +74,7 @@
until: remove_packages|success
retries: 5
delay: 2
with_items: "{{ nova_spice_packages | deprecated(nova_spice_apt_packages, 'nova_spice_apt_packages', 'nova_spice_packages', 'Ocata') }}"
with_items: "{{ nova_spice_distro_packages }}"
when:
- inventory_hostname in groups['nova_console']
- nova_console_type == "spice"
@ -91,7 +91,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ nova_novnc_packages | deprecated(nova_novnc_apt_packages, 'nova_novnc_apt_packages', 'nova_novnc_packages', 'Ocata') }}"
with_items: "{{ nova_novnc_distro_packages }}"
when:
- inventory_hostname in groups['nova_console']
- nova_console_type == "novnc"
@ -108,7 +108,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ nova_compute_kvm_packages | deprecated(nova_compute_kvm_apt_packages, 'nova_compute_kvm_apt_packages', 'nova_compute_kvm_packages', 'Ocata') }}"
with_items: "{{ nova_compute_kvm_distro_packages }}"
when:
- inventory_hostname in groups['nova_compute']
- nova_virt_type == 'kvm' or nova_virt_type == 'qemu'
@ -125,7 +125,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ nova_compute_lxd_packages }}"
with_items: "{{ nova_compute_lxd_distro_packages }}"
when:
- inventory_hostname in groups['nova_compute']
- nova_virt_type == 'lxd'

12
vars/ubuntu-14.04.yml
View File

@ -17,17 +17,17 @@
cache_timeout: 600
# Common apt packages
nova_packages:
nova_distro_packages:
- genisoimage
- git
- libpq-dev
- iptables
# Spice console apt packages
nova_spice_packages:
nova_spice_distro_packages:
- spice-html5
nova_novnc_packages:
nova_novnc_distro_packages:
- libjs-jquery
- libjs-sphinxdoc
- libjs-underscore
@ -35,7 +35,7 @@ nova_novnc_packages:
- librabbitmq1
- libyaml-0-2
nova_compute_kvm_packages:
nova_compute_kvm_distro_packages:
- bridge-utils
- genisoimage
- kpartx
@ -52,7 +52,7 @@ nova_compute_kvm_packages:
- dosfstools-dbg
- multipath-tools
nova_compute_lxd_packages:
nova_compute_lxd_distro_packages:
- bridge-utils
- dosfstools
- dosfstools-dbg
@ -74,7 +74,7 @@ uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
# nova powervm virt driver
nova_compute_powervm_packages:
nova_compute_powervm_distro_packages:
- bridge-utils
- genisoimage
- kpartx

12
vars/ubuntu-16.04.yml
View File

@ -17,17 +17,17 @@
cache_timeout: 600
# Common apt packages
nova_packages:
nova_distro_packages:
- genisoimage
- git
- libpq-dev
- iptables
# Spice console apt packages
nova_spice_packages:
nova_spice_distro_packages:
- spice-html5
nova_novnc_packages:
nova_novnc_distro_packages:
- libjs-jquery
- libjs-sphinxdoc
- libjs-underscore
@ -35,7 +35,7 @@ nova_novnc_packages:
- librabbitmq1
- libyaml-0-2
nova_compute_kvm_packages:
nova_compute_kvm_distro_packages:
- bridge-utils
- genisoimage
- kpartx
@ -52,7 +52,7 @@ nova_compute_kvm_packages:
- dosfstools-dbg
- multipath-tools
nova_compute_lxd_packages:
nova_compute_lxd_distro_packages:
- bridge-utils
- dosfstools
- dosfstools-dbg
@ -73,7 +73,7 @@ uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
# nova powervm virt driver
nova_compute_powervm_packages:
nova_compute_powervm_distro_packages:
- bridge-utils
- genisoimage
- kpartx