diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-20 17:54:33 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-21 05:42:46 +0100 |
| commit | cf0e2f19037db5138b09c77b33f2b96b2ad458e8 (patch) | |
| tree | b624e9e4d0c32495d96e43e121f8cdec7d5f043f /patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch | |
| parent | 7c7cc0baae89b0c017d64e41f1317ed48a80ecbd (diff) | |
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch')
| -rw-r--r-- | patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 <Alexandru.Avadanii@enea.com> 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 |