From 52b7dd42e885c4b502528b53544c297200837565 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 30 Aug 2016 16:32:36 +0100 Subject: [PATCH] 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 --- examples/playbook.yml | 2 +- .../notes/package-list-name-changes-4d5ad2e6ff5ecae2.yaml | 4 ++++ tasks/aodh_init_common.yml | 2 +- tasks/aodh_install_apt.yml | 4 ++-- tests/test-install-aodh.yml | 2 +- tests/test-install-infra.yml | 2 +- tests/test-install-tempest.yml | 2 +- vars/debian.yml | 6 +++--- 8 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/package-list-name-changes-4d5ad2e6ff5ecae2.yaml diff --git a/examples/playbook.yml b/examples/playbook.yml index 37a5780..754c225 100644 --- a/examples/playbook.yml +++ b/examples/playbook.yml @@ -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" \ No newline at end of file + keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3" diff --git a/releasenotes/notes/package-list-name-changes-4d5ad2e6ff5ecae2.yaml b/releasenotes/notes/package-list-name-changes-4d5ad2e6ff5ecae2.yaml new file mode 100644 index 0000000..422de2f --- /dev/null +++ b/releasenotes/notes/package-list-name-changes-4d5ad2e6ff5ecae2.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - The variable ``aodh_apt_packages`` has been renamed to + ``aodh_distro_packages``. diff --git a/tasks/aodh_init_common.yml b/tasks/aodh_init_common.yml index 89d41ec..af51a07 100644 --- a/tasks/aodh_init_common.yml +++ b/tasks/aodh_init_common.yml @@ -24,4 +24,4 @@ name: "{{ program_name }}" enabled: "yes" notify: - - Restart aodh services \ No newline at end of file + - Restart aodh services diff --git a/tasks/aodh_install_apt.yml b/tasks/aodh_install_apt.yml index 6516e29..4a7dab6 100644 --- a/tasks/aodh_install_apt.yml +++ b/tasks/aodh_install_apt.yml @@ -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 diff --git a/tests/test-install-aodh.yml b/tests/test-install-aodh.yml index baf32c6..8f8b6c5 100644 --- a/tests/test-install-aodh.yml +++ b/tests/test-install-aodh.yml @@ -62,4 +62,4 @@ roles: - role: "{{ rolename | basename }}" vars_files: - - test-vars.yml \ No newline at end of file + - test-vars.yml diff --git a/tests/test-install-infra.yml b/tests/test-install-infra.yml index 7f357aa..86e8625 100644 --- a/tests/test-install-infra.yml +++ b/tests/test-install-infra.yml @@ -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 }}" \ No newline at end of file + galera_server_id: "{{ inventory_hostname | string_2_int }}" diff --git a/tests/test-install-tempest.yml b/tests/test-install-tempest.yml index be90c21..201755e 100644 --- a/tests/test-install-tempest.yml +++ b/tests/test-install-tempest.yml @@ -20,4 +20,4 @@ roles: - role: "os_tempest" vars_files: - - test-vars.yml \ No newline at end of file + - test-vars.yml diff --git a/vars/debian.yml b/vars/debian.yml index 6a4a1a4..b659db2 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -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 \ No newline at end of file +aodh_test_distro_packages: + - git