From 768af20e849b5f738a1051e4184577d1f64a0ca2 Mon Sep 17 00:00:00 2001
From: Will Miller <willm@stackhpc.com>
Date: Fri, 7 Sep 2018 13:22:06 +0100
Subject: [PATCH] Move pip settings to group_vars/all

We need to use pip on localhost as well as on hypervisors, for Ironic
enrolment.
---
 ansible/group_vars/all         | 9 +++++++++
 ansible/group_vars/hypervisors | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 ansible/group_vars/all

diff --git a/ansible/group_vars/all b/ansible/group_vars/all
new file mode 100644
index 0000000..6eee2da
--- /dev/null
+++ b/ansible/group_vars/all
@@ -0,0 +1,9 @@
+---
+# Path to virtualenv used to install Python requirements. If a virtualenv does
+# not exist at this location, one will be created.
+virtualenv_path: "{{ '/'.join([ansible_env['HOME'], 'tenks-venv']) }}"
+
+# The URL of the upper constraints file to pass to pip when installing Python
+# packages.
+python_upper_constraints_url: >-
+  https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt
diff --git a/ansible/group_vars/hypervisors b/ansible/group_vars/hypervisors
index 4b7eb96..dc6dcad 100644
--- a/ansible/group_vars/hypervisors
+++ b/ansible/group_vars/hypervisors
@@ -6,15 +6,6 @@ physnet_mappings: {}
 system_requirements:
   - python-virtualenv
 
-# Path to virtualenv used to install Python requirements. If a virtualenv does
-# not exist at this location, one will be created.
-virtualenv_path: "{{ '/'.join([ansible_env['HOME'], 'tenks-venv']) }}"
-
-# The URL of the upper constraints file to pass to pip when installing Python
-# packages.
-python_upper_constraints_url: >-
-  https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt
-
 # Naming scheme for bridges created by tenks for physical networks is
 # {{ bridge_prefix + i }}, where `i` is the index of the physical network in
 # physnet_mappings (sorted alphabetically by key).