Rename package lists (and related vars) appropriately

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: Ia44a7a5eefdba72a55ffa877d92cdda2732d4c73
This commit is contained in:
Jesse Pretorius 2016-08-30 16:41:49 +01:00
parent 0ed3836052
commit de037c4d3f
9 changed files with 19 additions and 13 deletions

View File

@ -5,4 +5,4 @@
- { role: "os_ceilometer", tags: [ "ceilometer-config", "ceilometer-install" ] }
vars:
external_lb_vip_address: 172.16.24.1
internal_lb_vip_address: 192.168.0.1
internal_lb_vip_address: 192.168.0.1

View File

@ -0,0 +1,6 @@
---
upgrade:
- The variable ``ceilometer_apt_packages`` has been renamed to
``ceilometer_distro_packages``.
- The variable ``ceilometer_developer_mode_apt_packages`` has been renamed to
``ceilometer_developer_mode_distro_packages``.

View File

@ -74,4 +74,4 @@
owner: "root"
group: "root"
notify:
- Restart ceilometer services
- Restart ceilometer services

View File

@ -34,7 +34,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ ceilometer_apt_packages }}"
with_items: "{{ ceilometer_distro_packages }}"
- name: Install packages required in Developer Mode
apt:
@ -44,6 +44,6 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ ceilometer_developer_mode_apt_packages }}"
with_items: "{{ ceilometer_developer_mode_distro_packages }}"
when:
- ceilometer_developer_mode | bool

View File

@ -45,4 +45,4 @@
- name: os_glance
src: https://git.openstack.org/openstack/openstack-ansible-os_glance
scm: git
version: master
version: master

View File

@ -20,4 +20,4 @@
roles:
- role: "os_tempest"
vars_files:
- test-vars.yml
- test-vars.yml

View File

@ -155,4 +155,4 @@ tempest_pip_packages:
tempest_plugins:
- name: tempest-ceilometer
repo: https://git.openstack.org/openstack/ceilometer
branch: master
branch: master

View File

@ -17,11 +17,11 @@
cache_timeout: 600
# Common apt packages
ceilometer_apt_packages:
ceilometer_distro_packages:
- rpcbind
- rsync
- git
# Packages required in developer mode, where packages are built locally
ceilometer_developer_mode_apt_packages:
- libvirt-dev
ceilometer_developer_mode_distro_packages:
- libvirt-dev

View File

@ -17,12 +17,12 @@
cache_timeout: 600
# Common apt packages
ceilometer_apt_packages:
ceilometer_distro_packages:
- rpcbind
- rsync
- git
# Packages required in developer mode, where packages are built locally
ceilometer_developer_mode_apt_packages:
ceilometer_developer_mode_distro_packages:
- pkg-config
- libvirt-dev
- libvirt-dev