From ea7e218d76156092fc33c60994e780f9fe5fc5ef Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Mon, 15 Aug 2016 15:45:33 -0500
Subject: [PATCH] Allow the repo-build to index utility pip packages

This change moves the list of utility packages to a var file
which will allow the repo-build and py_pkgs lookup plugin to
index the packages and correctly build any wheels being
required by the playbook.

Change-Id: I38264c82008c1016aab5bb789c3c765e443f233c
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
---
 playbooks/inventory/group_vars/utility_all.yml | 16 ++++++++++++++++
 playbooks/utility-install.yml                  | 14 --------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/playbooks/inventory/group_vars/utility_all.yml b/playbooks/inventory/group_vars/utility_all.yml
index cfd5b69da1..f88c5b0b5b 100644
--- a/playbooks/inventory/group_vars/utility_all.yml
+++ b/playbooks/inventory/group_vars/utility_all.yml
@@ -23,3 +23,19 @@ galera_client_drop_config_file: true
 
 # Ensure that the package state matches the global setting
 utility_package_state: "{{ package_state }}"
+
+# Python packages to be installed into the utility container
+utility_pip_packages:
+  - gnocchiclient
+  - python-openstackclient
+  - python-ceilometerclient
+  - python-cinderclient
+  - python-glanceclient
+  - python-heatclient
+  - python-keystoneclient
+  - python-neutronclient
+  - python-novaclient
+  - python-ironicclient
+  - python-swiftclient
+  - python-memcached
+  - pycrypto
diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml
index 30a902b952..f1e4e5dfae 100644
--- a/playbooks/utility-install.yml
+++ b/playbooks/utility-install.yml
@@ -97,18 +97,4 @@
       - git
     utility_yum_packages:
       - git
-    utility_pip_packages:
-      - python-openstackclient
-      - python-ceilometerclient
-      - python-cinderclient
-      - python-glanceclient
-      - python-heatclient
-      - python-keystoneclient
-      - python-neutronclient
-      - python-novaclient
-      - python-ironicclient
-      - python-swiftclient
-      - gnocchiclient
-      - python-memcached
-      - pycrypto
     is_metal: "{{ properties.is_metal|default(false) }}"