From 6648266ab7036b98aaeeb1e46814a12fcf01bc0f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
Date: Mon, 8 May 2017 11:49:39 +0000
Subject: [PATCH] Make pkg_locations overridable easier

In case a deployer wants to override pkg_locations (for example
in order to add extra locations), this variable should be overriable
in user space.

This moves the variable to group_vars to make it overridable in
userspace easily.

Change-Id: I6a4616fe80d7bd9ed0fa6f5d4a88c18d0d75cf8c
---
 group_vars/repo_all.yml  | 5 +++++
 playbooks/repo-build.yml | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/group_vars/repo_all.yml b/group_vars/repo_all.yml
index 049c35de72..e75a2c7f90 100644
--- a/group_vars/repo_all.yml
+++ b/group_vars/repo_all.yml
@@ -66,3 +66,8 @@ repo_build_pip_no_binary:
 # Set the build tag and the repo version
 repo_build_release_tag: "{{ openstack_release }}"
 repo_build_os_distro_version: "{{ os_distro_version }}"
+
+pkg_locations:
+  - "{{ playbook_dir }}/../"
+  - /etc/ansible/roles
+  - /etc/openstack_deploy
diff --git a/playbooks/repo-build.yml b/playbooks/repo-build.yml
index 718bf52c38..cfa6117a06 100644
--- a/playbooks/repo-build.yml
+++ b/playbooks/repo-build.yml
@@ -125,11 +125,6 @@
     - role: "repo_build"
   vars_files:
     - defaults/repo_packages/openstack_services.yml
-  vars:
-    pkg_locations:
-      - "{{ playbook_dir }}/../"
-      - /etc/ansible/roles
-      - /etc/openstack_deploy
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
     - repo-build