From e87378f10cf47db7cff6e5e0e33514f88dd3e348 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 30 Aug 2016 16:34:28 +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: I9f20c6c53709202fe09f38ffe20f96e860ba188a
---
 .travis.yml                    | 2 +-
 examples/playbook.yml          | 2 +-
 handlers/main.yml              | 2 +-
 tasks/barbican_install_apt.yml | 6 +++---
 tasks/init.yml                 | 2 +-
 tasks/init_common.yml          | 2 +-
 tasks/post-install.yml         | 2 +-
 vars/debian.yml                | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 36bbf62..49e7e1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,4 +26,4 @@ script:
   - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
 
 notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
\ No newline at end of file
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/examples/playbook.yml b/examples/playbook.yml
index 4dcdd38..e68e754 100644
--- a/examples/playbook.yml
+++ b/examples/playbook.yml
@@ -12,4 +12,4 @@
    barbican_rabbitmq_password: SuperSecretePassword3
    keystone_admin_user_name: admin
    keystone_auth_admin_password: SuperSecretePassword4
-   keystone_admin_tenant_name: admin
\ No newline at end of file
+   keystone_admin_tenant_name: admin
diff --git a/handlers/main.yml b/handlers/main.yml
index ab27482..8de1cb7 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -26,4 +26,4 @@
 - name: Restart barbican services
   service:
     name: "{{ barbican_uwsgi_program_name }}"
-    state: "restarted"
\ No newline at end of file
+    state: "restarted"
diff --git a/tasks/barbican_install_apt.yml b/tasks/barbican_install_apt.yml
index e030915..e448f6e 100644
--- a/tasks/barbican_install_apt.yml
+++ b/tasks/barbican_install_apt.yml
@@ -25,8 +25,8 @@
   apt:
     pkg: "{{ item }}"
     state: "{{ barbican_package_state }}"
-  register: install_barbican_apt_packages
-  until: install_barbican_apt_packages |success
+  register: install_barbican_distro_packages
+  until: install_barbican_distro_packages |success
   retries: 5
   delay: 2
-  with_items: "{{ barbican_apt_packages }}"
+  with_items: "{{ barbican_distro_packages }}"
diff --git a/tasks/init.yml b/tasks/init.yml
index d7b9760..bb3ddae 100644
--- a/tasks/init.yml
+++ b/tasks/init.yml
@@ -21,4 +21,4 @@
     system_user: "{{ barbican_system_user_name }}"
     system_group: "{{ barbican_system_group_name }}"
     service_home: "{{ barbican_system_user_home }}"
-    log_directory: "{{ barbican_log_directory }}"
\ No newline at end of file
+    log_directory: "{{ barbican_log_directory }}"
diff --git a/tasks/init_common.yml b/tasks/init_common.yml
index 64c941b..8992d9b 100644
--- a/tasks/init_common.yml
+++ b/tasks/init_common.yml
@@ -24,4 +24,4 @@
    name: "{{ program_name }}"
    enabled: "yes"
   notify:
-    - Restart barbican services
\ No newline at end of file
+    - Restart barbican services
diff --git a/tasks/post-install.yml b/tasks/post-install.yml
index d142ced..a82fbfc 100644
--- a/tasks/post-install.yml
+++ b/tasks/post-install.yml
@@ -42,4 +42,4 @@
     - source: "barbican-vassals-api.ini.j2"
       destination: "{{ barbican_etc_directory }}/vassals/barbican-api.ini"
       config_overrides: "{{ barbican_vassals_api_overrides }}"
-      config_type: "ini"
\ No newline at end of file
+      config_type: "ini"
diff --git a/vars/debian.yml b/vars/debian.yml
index 44a33a0..43072c7 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-barbican_apt_packages:
+barbican_distro_packages:
   - apache2
   - apache2-utils
   - libapache2-mod-wsgi
@@ -22,4 +22,4 @@ barbican_apt_packages:
   - git
   - libffi-dev
   - gettext
-  - build-essential
\ No newline at end of file
+  - build-essential