Merge "Make pkg_locations overridable easier"

2017-09-08 10:36:13 +00:00 · 2017-09-08 10:36:13 +00:00 · 9b9dde4745
commit 9b9dde4745
parent a28026bf59 6648266ab7
2 changed files with 5 additions and 5 deletions
--- 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
--- 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