From 2aa35cd95df220c7eb5474d949e8d2254114c305 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 30 Aug 2016 20:05:14 +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: Ib7e0d248ca50198ed3d3b5623feafdad26f5df63
---
 examples/playbook.yml    | 2 +-
 tasks/install_online.yml | 2 +-
 tasks/main.yml           | 2 +-
 tasks/pre_install.yml    | 4 ++--
 vars/redhat.yml          | 2 +-
 vars/ubuntu-14.04.yml    | 2 +-
 vars/ubuntu-16.04.yml    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/playbook.yml b/examples/playbook.yml
index a3785e0..8e349d8 100644
--- a/examples/playbook.yml
+++ b/examples/playbook.yml
@@ -3,4 +3,4 @@
   user: root
   roles:
     - role: "pip_install"
-      pip_lock_to_internal_repo: True
\ No newline at end of file
+      pip_lock_to_internal_repo: True
diff --git a/tasks/install_online.yml b/tasks/install_online.yml
index 834e637..9bd67f1 100644
--- a/tasks/install_online.yml
+++ b/tasks/install_online.yml
@@ -41,4 +41,4 @@
   tags:
     - pip-install-script
 
-- include: install_source.yml
\ No newline at end of file
+- include: install_source.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index fc5a3e1..2d54404 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -34,4 +34,4 @@
 
 - include: install.yml
   tags:
-    - pip-install
\ No newline at end of file
+    - pip-install
diff --git a/tasks/pre_install.yml b/tasks/pre_install.yml
index 1683fec..bbb1ba6 100644
--- a/tasks/pre_install.yml
+++ b/tasks/pre_install.yml
@@ -21,7 +21,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ python_packages }}"
+  with_items: "{{ pip_install_distro_packages }}"
   when:
     - ansible_pkg_mgr == 'yum'
 
@@ -50,6 +50,6 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ python_packages }}"
+  with_items: "{{ pip_install_distro_packages }}"
   when:
     - ansible_pkg_mgr == 'apt'
diff --git a/vars/redhat.yml b/vars/redhat.yml
index b5c7e0a..6664330 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-python_packages:
+pip_install_distro_packages:
   - gcc
   - libffi-devel
   - openssl-devel
diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml
index 1e86dfd..c934af5 100644
--- a/vars/ubuntu-14.04.yml
+++ b/vars/ubuntu-14.04.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-python_packages:
+pip_install_distro_packages:
   - build-essential
   - python-setuptools
   - libffi-dev
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 50befeb..d2be424 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-python_packages:
+pip_install_distro_packages:
   - build-essential
   - python-dev
   - python-setuptools