Remove nginx wr, update docker
* As models were fixed with deletion of unused pillar in offline models
remove WR for that
* Also, as it better to use pkg from mcp replace docker.io with docker-ce
Change-Id: Ice8319c2a9268949d4a1a247a0eb1fb0b66ef1c5
diff --git a/tcp_tests/templates/virtual-offline-ssl/openstack.yaml b/tcp_tests/templates/virtual-offline-ssl/openstack.yaml
index 804f22b..0436506 100644
--- a/tcp_tests/templates/virtual-offline-ssl/openstack.yaml
+++ b/tcp_tests/templates/virtual-offline-ssl/openstack.yaml
@@ -349,6 +349,12 @@
retry: {count: 10, delay: 30}
skip_fail: false
+- description: Workaround to avoid reboot cmp nodes bring OVS interfaces UP
+ cmd: |
+ salt 'cmp*' cmd.run "ifup br-mesh";
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
# Configure cinder-volume salt-call
#- description: Set disks 01
# cmd: salt-call cmd.run 'echo -e "nn\np\n\n\n\nw" | fdisk /dev/vdb'
@@ -527,7 +533,3 @@
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 30}
skip_fail: false
-
-{{ BACKUP.MACRO_WR_NGINX_MASTER() }}
-{{ BACKUP.MACRO_BACKUP_BACKUPNINJA() }}
-{{ BACKUP.MACRO_BACKUP_XTRABACKUP() }}
\ No newline at end of file