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: I0f6e177d080da10ba3e992f1c2f1e5cd7a4262ff
This commit is contained in:
Jesse Pretorius 2016-08-30 16:32:36 +01:00
parent 636a14d0c6
commit 52b7dd42e8
8 changed files with 14 additions and 10 deletions

View File

@ -25,4 +25,4 @@
keystone_service_internaluri: "http://1.2.3.4:5000"
keystone_service_internalurl: "{{ keystone_service_internaluri }}/v3"
keystone_service_adminuri: "http://5.6.7.8:35357"
keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3"
keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3"

View File

@ -0,0 +1,4 @@
---
upgrade:
- The variable ``aodh_apt_packages`` has been renamed to
``aodh_distro_packages``.

View File

@ -24,4 +24,4 @@
name: "{{ program_name }}"
enabled: "yes"
notify:
- Restart aodh services
- Restart aodh services

View File

@ -34,7 +34,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ aodh_apt_packages }}"
with_items: "{{ aodh_distro_packages }}"
- name: Install apt packages for testing
apt:
@ -44,5 +44,5 @@
until: install_test_packages|success
retries: 5
delay: 2
with_items: "{{ aodh_apt_test_packages }}"
with_items: "{{ aodh_test_distro_packages }}"
when: install_test_packages|bool

View File

@ -62,4 +62,4 @@
roles:
- role: "{{ rolename | basename }}"
vars_files:
- test-vars.yml
- test-vars.yml

View File

@ -29,4 +29,4 @@
galera_wsrep_node_name: "{{ inventory_hostname }}"
galera_wsrep_provider_options:
- { option: "gcache.size", value: "32M" }
galera_server_id: "{{ inventory_hostname | string_2_int }}"
galera_server_id: "{{ inventory_hostname | string_2_int }}"

View File

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

View File

@ -17,7 +17,7 @@
cache_timeout: 600
# Common apt packages
aodh_apt_packages:
aodh_distro_packages:
- rpcbind
- apache2
- apache2-utils
@ -27,5 +27,5 @@ aodh_apt_packages:
- libxml2-dev
- libxslt1-dev
aodh_apt_test_packages:
- git
aodh_test_distro_packages:
- git