From 833d62c9fe90af812815a8b216dc9baa37c2d48e Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 30 Aug 2016 20:02:12 +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: Ib607e78bd3be2f50fbfe2c7098706df7e91cd780 --- tasks/install-apt.yml | 2 +- tests/group_vars/all_containers.yml | 2 +- tests/test-install-infra.yml | 2 +- tests/test-install-keystone.yml | 2 +- tests/test-prepare-containers.yml | 2 +- tests/test-prepare-keys.yml | 2 +- tests/test.yml | 2 +- vars/debian.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tasks/install-apt.yml b/tasks/install-apt.yml index 8a22de7..e5ec528 100644 --- a/tasks/install-apt.yml +++ b/tasks/install-apt.yml @@ -38,7 +38,7 @@ until: install_apt_packages | success retries: 5 delay: 2 - with_items: "{{ zaqar_apt_packages }}" + with_items: "{{ zaqar_distro_packages }}" when: - item != '' tags: diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml index e2ee86d..4cc9794 100644 --- a/tests/group_vars/all_containers.yml +++ b/tests/group_vars/all_containers.yml @@ -24,4 +24,4 @@ container_networks: type: "veth" physical_host: localhost properties: - service_name: "{{ inventory_hostname }}" \ No newline at end of file + service_name: "{{ inventory_hostname }}" diff --git a/tests/test-install-infra.yml b/tests/test-install-infra.yml index b59a635..7854d9a 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-keystone.yml b/tests/test-install-keystone.yml index e1738cf..1123d48 100644 --- a/tests/test-install-keystone.yml +++ b/tests/test-install-keystone.yml @@ -78,4 +78,4 @@ keystone_rabbitmq_vhost: /keystone keystone_rabbitmq_servers: 10.100.100.2 keystone_rabbitmq_use_ssl: false - galera_client_drop_config_file: false \ No newline at end of file + galera_client_drop_config_file: false diff --git a/tests/test-prepare-containers.yml b/tests/test-prepare-containers.yml index 4b88333..3820cfe 100644 --- a/tests/test-prepare-containers.yml +++ b/tests/test-prepare-containers.yml @@ -30,4 +30,4 @@ port: "{{ ansible_ssh_port | default('22') }}" host: "{{ ansible_ssh_host | default(inventory_hostname) }}" search_regex: OpenSSH - delay: 1 \ No newline at end of file + delay: 1 diff --git a/tests/test-prepare-keys.yml b/tests/test-prepare-keys.yml index 3993373..be1b8fc 100644 --- a/tests/test-prepare-keys.yml +++ b/tests/test-prepare-keys.yml @@ -27,4 +27,4 @@ command: cat ~/.ssh/id_rsa.pub register: key_get - set_fact: - lxc_container_ssh_key: "{{ key_get.stdout }}" \ No newline at end of file + lxc_container_ssh_key: "{{ key_get.stdout }}" diff --git a/tests/test.yml b/tests/test.yml index 333c3ca..1210050 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -32,4 +32,4 @@ - include: test-install-zaqar.yml # Test Zaqar -- include: test-zaqar-functional.yml \ No newline at end of file +- include: test-zaqar-functional.yml diff --git a/vars/debian.yml b/vars/debian.yml index 7811b4e..a361a11 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -15,7 +15,7 @@ ## APT Cache options cache_timeout: 600 -zaqar_apt_packages: +zaqar_distro_packages: - gcc - libxml2-dev - libxslt1-dev