commit 31134ef25712077e62b44e80d9953a79f8a8fe91
author Zack Williams <zdw@opennetworking.org> Thu Apr 19 22:15:52 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Mon Apr 30 09:04:01 2018 -0700
tree 7c20cb617bdd94fcea99711a43a0a12477a18a2a
parent 3f6415f0868bcf2f09d995c0f3d29e87354a2ac5

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

Change-Id: I69c0795ae7a915cbdd9a970a0c2c7c3ba3d027a6

Makefile

diff --git a/Makefile b/Makefile
index 8bab022..3becdbc 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@
 
 $(CONFIG_FILES):
 	test -e "$(PODCONFIG_PATH)" || { echo "PODCONFIG file $(PODCONFIG_PATH) doesn't exist!" ; exit 1; }
-	ansible-playbook -i 'localhost,' --extra-vars="cord_podconfig='$(PODCONFIG_PATH)' genconfig_dir='$(GENCONFIG_D)' scenarios_dir='$(SCENARIOS_D)' platform_install_dir='$(PI)'" $(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)'" $(BUILD)/ansible/genconfig.yml $(LOGCMD)
 
 printconfig:
 	@echo "Scenario: '$(SCENARIO)'"

ansible/genconfig.yml

diff --git a/ansible/genconfig.yml b/ansible/genconfig.yml
index 1e75e14..61c9417 100644
--- a/ansible/genconfig.yml
+++ b/ansible/genconfig.yml
@@ -87,14 +87,13 @@
 
     - 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: (not master_config.frontend_only) and (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.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:

scenarios/local/config.yml

diff --git a/scenarios/local/config.yml b/scenarios/local/config.yml
index 993926f..6b8d514 100644
--- a/scenarios/local/config.yml
+++ b/scenarios/local/config.yml
@@ -49,6 +49,7 @@
   - "xosproject/xos-libraries"
   - "xosproject/xos-postgres"
   - "xosproject/xos-tosca"
+  - "xosproject/xos-synchronizer-base"
   - "xosproject/xos-ws"
   - "xosproject/chameleon"
   - "gliderlabs/consul-server"