From 0a3c32b5acb1860ac91b2c79498e71716c5230b3 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 17 Aug 2018 04:51:07 -0500
Subject: [PATCH] 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
---
defaults/main.yml | 1 +
tasks/main.yaml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
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/'
puppet_environment: production
puppet_timeout: 30m
futureparser: False
+mgmt_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 @@
- name: copy puppet modules
synchronize:
- src: "{{ manifest_base }}/{{ puppet_environment }}"
+ src: "{{ mgmt_manifestpath }}"
dest: "{{ manifest_base }}"
- name: ensure hieradata manifest link is present