From c3e9c5f47fcce63b8a175c87b9b191b98ea83ab0 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 30 Aug 2016 19:59:58 +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: I1162765d88554e6858bd2aad6af1a390353a4440
---
 tasks/sahara_install_apt.yml      | 2 +-
 tests/test-install-infra.yml      | 2 +-
 tests/test-prepare-containers.yml | 2 +-
 vars/ubuntu-14.04.yml             | 2 +-
 vars/ubuntu-16.04.yml             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tasks/sahara_install_apt.yml b/tasks/sahara_install_apt.yml
index c797384..f16ebc8 100644
--- a/tasks/sahara_install_apt.yml
+++ b/tasks/sahara_install_apt.yml
@@ -32,4 +32,4 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ sahara_apt_packages }}"
+  with_items: "{{ sahara_distro_packages }}"
diff --git a/tests/test-install-infra.yml b/tests/test-install-infra.yml
index 77a90bd..7b3acf0 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-prepare-containers.yml b/tests/test-prepare-containers.yml
index ccb40af..914c17f 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/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml
index 7920d47..eb06336 100644
--- a/vars/ubuntu-14.04.yml
+++ b/vars/ubuntu-14.04.yml
@@ -16,7 +16,7 @@
 cache_timeout: 600
 
 # Common apt packages
-sahara_apt_packages:
+sahara_distro_packages:
   - rpcbind
   - rsync
   - git
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 7920d47..eb06336 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -16,7 +16,7 @@
 cache_timeout: 600
 
 # Common apt packages
-sahara_apt_packages:
+sahara_distro_packages:
   - rpcbind
   - rsync
   - git