commit 299098d19d2546d553d9ee8725f8cd9d9f5aee58
author Zack Williams <zdw@opennetworking.org> Thu Apr 19 22:15:52 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Thu Apr 19 22:15:52 2018 -0700
tree 51061b18b8c0ce51a59830627e78777e06c74e89
parent d082a601fc64f91f799a1a169e48d5328a8b9546

[CORD-2950] Fix ansible 2.5.1 breakage by using union operator instead of iterating over docker image lists

Change-Id: I7b651d881870b7f0daff02d28f1b1213073aa51d

Makefile

diff --git a/Makefile b/Makefile
index 12152e3..2e53c9d 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@
 
 $(CONFIG_FILES):
 	@test -e "$(PODCONFIG_PATH)" || { echo ""; echo "PODCONFIG file $(PODCONFIG_PATH) doesn't exist!" ; echo "*** Specify a valid CORD config file using PODCONFIG or PODCONFIG_PATH ***"; echo ""; exit 1; }
-	ansible-playbook -i 'localhost,' --extra-vars="cord_podconfig='$(PODCONFIG_PATH)' genconfig_dir='$(GENCONFIG_D)' scenarios_dir='$(SCENARIOS_D)' platform_install_dir='$(PI)' cord_profile_src_dir='$(PROFILE_D)' " $(BUILD)/ansible/genconfig.yml $(LOGCMD)
+	ansible-playbook $(ANSIBLE_ARGS) -i 'localhost,' --extra-vars="cord_podconfig='$(PODCONFIG_PATH)' genconfig_dir='$(GENCONFIG_D)' scenarios_dir='$(SCENARIOS_D)' platform_install_dir='$(PI)' cord_profile_src_dir='$(PROFILE_D)' " $(BUILD)/ansible/genconfig.yml $(LOGCMD)
 
 printconfig:
 	@echo "Scenario: '$(SCENARIO)'"

ansible/roles/genconfig/tasks/main.yml

diff --git a/ansible/roles/genconfig/tasks/main.yml b/ansible/roles/genconfig/tasks/main.yml
index 8f4bde3..2f837db 100644
--- a/ansible/roles/genconfig/tasks/main.yml
+++ b/ansible/roles/genconfig/tasks/main.yml
@@ -79,20 +79,19 @@
 
 - name: Add items to profile_container_list from profile_manifest.xos_services
   set_fact:
-    profile_container_list: "{{ profile_container_list }} + [ 'xosproject/{{ item.name }}-synchronizer' ]"
-  with_items: "{{ profile_manifest.xos_services }}"
-  when:  item.synchronizer is not defined or item.synchronizer
+    profile_container_list: |
+      {{ profile_container_list | union(profile_manifest.xos_services | map(attribute='name') | map('regex_replace', '(.*)','xosproject/\1-synchronizer') | list) }}
 
 - name: Add items to profile_container_list from profile_manifest.xos_dynamic_services
+  when: profile_manifest.xos_dynamic_services
   set_fact:
-    profile_container_list: "{{ profile_container_list }} + [ 'xosproject/{{ item.name }}-synchronizer' ]"
-  with_items: "{{ profile_manifest.xos_dynamic_services if 'xos_dynamic_services' in profile_manifest else [] }}"
-  when: item.synchronizer is not defined or item.synchronizer
+    profile_container_list: |
+      {{ profile_container_list | union(profile_manifest.xos_dynamic_services | map(attribute='name') | map('regex_replace', '(.*)','xosproject/\1-synchronizer') | list) }}
 
 - name: Add items to profile_container_list from profile_manifest.enabled_gui_extensions
   set_fact:
-    profile_container_list: "{{ profile_container_list }} + [ 'xosproject/gui-extension-{{ item.name }}' ]"
-  with_items: "{{ profile_manifest.enabled_gui_extensions }}"
+    profile_container_list: |
+      {{ profile_container_list | union(profile_manifest.enabled_gui_extensions | map(attribute='name') | map('regex_replace', '(.*)','xosproject/gui-extension-\1') | list) }}
 
 - name: Update docker_image_whitelist to include containers specified by profile
   set_fact: