diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-13 21:10:04 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-13 21:10:04 +0100 |
| commit | feb3b54f39d9710e50b9e0a29036d1dd69f4f3cd (patch) | |
| tree | 4db803bebcf1c6460b8813b0b3f0f0814cba413a /patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch | |
| parent | 5f808291d18c27a2c9bbf6b0b5094af2fa660334 (diff) | |
u/fuel: Bump & rebase for salt state retry
JIRA: FUEL-358
Change-Id: Ia1e422fd037c1dd1c689b535d2b430c533d9562d
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 | 6 |
1 files changed, 3 insertions, 3 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 c1f1b03e..0f15f447 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 @@ -56,10 +56,10 @@ index 4f3760f6..115a56c1 100755 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 9fc30bbf..998fc6b4 100755 +index 4c8cbcf8..1cf54240 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha -@@ -52,6 +52,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer +@@ -53,6 +53,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon @@ -69,7 +69,7 @@ index 9fc30bbf..998fc6b4 100755 salt -I 'horizon:server' file.symlink \ /var/lib/openstack-dashboard/static \ diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 80c0c87e..144245f9 100755 +index c391cfe6..02a813c9 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then |