commit 240795ccc3c6d3a57ad0ec1d2499917ea93115aa
author Andy Bavier <andy@onlab.us> Thu Dec 21 16:31:05 2017 -0700
committer Andy Bavier <andy@onlab.us> Fri Dec 22 09:54:48 2017 -0700
tree 9cc10ab24f3c39cba63735f1c7bbe279281899b8
parent 3aa32f03778e55f617559159efeec62176f6e1b9

CORD-2459 Combine profile variables into genconfig/config.yml

Change-Id: I71c010256701d60dbe554982fd9e9ae28bf4c7ee

ansible/genconfig.yml

diff --git a/ansible/genconfig.yml b/ansible/genconfig.yml
index 1e75e14..33f8202 100644
--- a/ansible/genconfig.yml
+++ b/ansible/genconfig.yml
@@ -77,9 +77,9 @@
         scenario_config: "{{ lookup('file', scenario_config_path) | from_yaml }}"
         profile_manifest: "{{ lookup('file', profile_manifest_path) | from_yaml }}"
 
-    - name: Combine pod and scenario config into master config
+    - name: Combine pod and scenario configs and profile manifest into master config
       set_fact:
-        master_config: "{{ scenario_config | combine(pod_config) }}"
+        master_config: "{{ profile_manifest | combine(scenario_config) | combine(pod_config) }}"
 
     - name: Prime profile_container_list from with master_config.docker_image_whitelist
       set_fact: