From cf0e2f19037db5138b09c77b33f2b96b2ad458e8 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 20 Jan 2018 17:54:33 +0100 Subject: u/fuel: Bump & rebase for mongodb & cinder fixes While at it, refresh Armband GPG public key embedded in maas config. Change-Id: Id1f167d3b8a1bc69a798557fb1b72f93e04cdb0b Signed-off-by: Alexandru Avadanii --- .../0002-salt-formulas-Add-enable-armband-formula.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch') diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch index 4d2ed29b..917e6347 100644 --- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch @@ -44,7 +44,7 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index 62a9654..9b88964 100755 +index 4948a50..93c73e7 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 @@ -53,13 +53,13 @@ index 62a9654..9b88964 100755 salt -I 'nova:compute' state.sls nova +wait_for 5.0 "salt -I 'nova:compute' state.sls armband" - salt -I 'mongodb:server' state.sls mongodb || true - wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" + salt -C 'I@mongodb:server and *01*' state.sls mongodb || true + wait_for 10 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha -index 0a27876..aa369e8 100755 +index bcb7807..09b84b9 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha -@@ -48,3 +48,5 @@ salt -I 'ceilometer:server' state.sls ceilometer +@@ -51,3 +51,5 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon -- cgit 1.2.3-korg