diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-23 19:03:53 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-27 16:59:28 +0000 |
| commit | 77e60fe7ecc572aa44e0da9e3817bd7b76078734 (patch) | |
| tree | 90b9d9162fe9667076f621290a04eff705c39eab /patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch | |
| parent | 777eb4c1bcab2062afcdc65a0575cba268de562d (diff) | |
ci/deploy.sh: Add support for CI_DEBUG
While at it, use SSH_SALT global var in `cleanup_uefi`.
Change-Id: I9400edde69d3aaaa1879cce0e79898c80db486db
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 3d92843941184335c2f1b3e8a074c6e9f2e49571)
Diffstat (limited to 'patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch')
| -rw-r--r-- | patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch index 9c8e1076..c8d9305a 100644 --- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -58,7 +58,7 @@ index 19cd417..73983d2 100755 + +salt -I 'nova:compute' state.sls armband || true diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index aada4ad..afd6c53 100755 +index 89733cc..f1479ef 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 @@ -67,7 +67,7 @@ index aada4ad..afd6c53 100755 salt -I 'nova:compute' state.sls nova +salt -I 'nova:compute' state.sls armband || true - salt -I 'mongodb:server' state.sls mongodb + salt -I 'mongodb:server' state.sls mongodb || true wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 0650869..7611c12 100755 |