summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmcp/config/states/maas3
-rw-r--r--mcp/patches/0009-seedng-module-Sync-salt-version.patch2
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml2
3 files changed, 4 insertions, 3 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 01f8ee0cd..710ec0e82 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -102,7 +102,8 @@ done
wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply salt"
-wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp"
+wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp | " \
+ "tee /dev/stderr | fgrep -q 'Not connected'"
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
$(awk 'NR==1{print $2}' $(eval echo ~${SUDO_USER}/.ssh/authorized_keys))"
diff --git a/mcp/patches/0009-seedng-module-Sync-salt-version.patch b/mcp/patches/0009-seedng-module-Sync-salt-version.patch
index cfab88304..b88314774 100644
--- a/mcp/patches/0009-seedng-module-Sync-salt-version.patch
+++ b/mcp/patches/0009-seedng-module-Sync-salt-version.patch
@@ -19,7 +19,7 @@ diff --git a/_modules/seedng.py b/_modules/seedng.py
+ arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
cmd = 'if type salt-minion; then exit 0; '
- cmd += 'else sh {0} -c /tmp; fi'.format(os.path.join(tmppath, 'bootstrap-salt.sh'))
-+ cmd += 'else sh {0} {1} -c /tmp; fi'.format(
++ cmd += 'else sh {0} -c /tmp {1}; fi'.format(
+ os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
return not __salt__['cmd.run_chroot'](mpt, cmd, python_shell=True)['retcode']
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
index e73c051e3..f6f58066b 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
@@ -1,5 +1,5 @@
classes:
- cluster.virtual-mcp-ocata-common.openstack_gateway
+- cluster.virtual-mcp-ocata-common.openstack_gateway
- service.neutron.gateway.single
- cluster.virtual-mcp-ocata-ovs
parameters: