summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2018-08-17 04:51:07 -0500
committerMonty Taylor <mordred@inaugust.com>2018-08-17 05:21:53 -0500
commit0a3c32b5acb1860ac91b2c79498e71716c5230b3 (patch)
tree50371e530dc6015cd0ee451576d0f6cd2e79b19b
parentd8a19430819a7f3f4330b3a6a9e9039953fe4e2e (diff)
Add ability to override mgmt manifest path
We have it currently hardcoded that the manifests on the management server are going to have an environment path. Add a variable to allow override of that idea. Change-Id: I226c030332ff93c3ee74650c7ab725994971f007 Needed-By: https://review.openstack.org/592763
Notes
Notes (review): Code-Review+1: Colleen Murphy <colleen@gazlene.net> Code-Review+2: James E. Blair <corvus@inaugust.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 17 Aug 2018 17:45:44 +0000 Reviewed-on: https://review.openstack.org/592946 Project: openstack-infra/ansible-role-puppet Branch: refs/heads/master
-rw-r--r--defaults/main.yml1
-rw-r--r--tasks/main.yaml2
2 files changed, 2 insertions, 1 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index 5530aad..58573eb 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -17,3 +17,4 @@ puppet_environment_basedir: '/opt/system-config/'
17puppet_environment: production 17puppet_environment: production
18puppet_timeout: 30m 18puppet_timeout: 30m
19futureparser: False 19futureparser: False
20mgmt_manifestpath: '{{ manifest_base }}/{{ puppet_environment }}'
diff --git a/tasks/main.yaml b/tasks/main.yaml
index d72f923..ea8dfd1 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -73,7 +73,7 @@
73 73
74 - name: copy puppet modules 74 - name: copy puppet modules
75 synchronize: 75 synchronize:
76 src: "{{ manifest_base }}/{{ puppet_environment }}" 76 src: "{{ mgmt_manifestpath }}"
77 dest: "{{ manifest_base }}" 77 dest: "{{ manifest_base }}"
78 78
79 - name: ensure hieradata manifest link is present 79 - name: ensure hieradata manifest link is present