diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-03 18:20:17 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-03 19:58:31 +0000 |
| commit | cbd85660a376264b5fc3bde17e4d7c9dfbbd53d3 (patch) | |
| tree | b152dcbfec91f14cd8b9ba5854b77083d314d798 /patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch | |
| parent | d79947a082dd7d342b8572d7f74b690cae605b05 (diff) | |
u/fuel: Bump & rebase for debian_ip lowercase fix
While at it, revert commit adding "opnfv" user to "libvirt" group,
as it would break with the current event flow (opnfv user being
created prior to libvirt group).
Change-Id: I6f5d578153c33dcddac76bc7bc6b428fe6796b1a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4b7e790d335787ce0837ca47025dd7a14287e52a)
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 | 6 |
1 files changed, 3 insertions, 3 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 e6e09bfc..14a2c9af 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 9237cc0..17421a9 100755 +index e816a9d..f688f5c 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 @@ -70,10 +70,10 @@ index 9237cc0..17421a9 100755 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 +index 9ebf4bf..044e645 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -23,6 +23,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ +@@ -26,6 +26,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp |