diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-23 19:16:30 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-23 19:17:35 +0100 |
| commit | 812d2f0ef3b7f638a29f10770007ef249d609c2c (patch) | |
| tree | 7e78a7753ff933797fc2f8d510c71275bc713bde /patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch | |
| parent | 72e0ffab0e9968161734183a72477a92b51c1a90 (diff) | |
u/fuel: Bump & rebase for MaaS fabrics fix
Change-Id: I58bacd2b8f9d210fd9e144cd8db6239ca0b8949d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch')
| -rw-r--r-- | patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch index e4fcfc07..2fef9ae3 100644 --- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch @@ -46,10 +46,10 @@ 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 b/mcp/config/states/openstack -index 19cd417..73983d2 100755 +index 369e165..d2a0b63 100755 --- a/mcp/config/states/openstack +++ b/mcp/config/states/openstack -@@ -43,3 +43,5 @@ salt -I 'ceilometer:server' state.sls ceilometer +@@ -47,3 +47,5 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon @@ -68,10 +68,10 @@ index e1fdf73..e1f705c 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 cfd5e42..27614d0 100755 +index c355126..99fb517 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -31,6 +31,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ +@@ -46,6 +46,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp |