diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-16 01:11:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-16 01:11:12 +0000 |
| commit | 13b071a86f5c552be17f12ae90ae73b94c1dc741 (patch) | |
| tree | 73e1d786de5cbf3234e6e9bf5c153a2a820f87d7 /patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch | |
| parent | 40f2e0e9a211949b416bf28fab5ae736d199c93b (diff) | |
| parent | a4e42550c023bd746143ba323de2bcc61e758bbb (diff) | |
Merge "u/fuel: Bump & rebase for common reclass rework" into stable/euphrates
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 | 12 |
1 files changed, 6 insertions, 6 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 b211e50e..c09d21a7 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 @@ -48,20 +48,20 @@ 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 beb6abb..885f2ac 100755 +index 9683103..624b08e 100755 --- a/mcp/config/states/openstack +++ b/mcp/config/states/openstack -@@ -35,3 +35,5 @@ salt -I 'ceilometer:server' state.sls ceilometer +@@ -41,3 +41,5 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon + +salt -I 'nova:compute' state.sls armband diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index c4c513d..9084678 100755 +index 230288f..921b216 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha -@@ -44,6 +44,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 +@@ -50,6 +50,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 salt -I 'neutron:gateway' state.sls neutron.gateway salt -I 'nova:compute' state.sls nova @@ -70,10 +70,10 @@ index c4c513d..9084678 100755 salt -I 'mongodb:server' state.sls mongodb 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 645009b..79ad880 100755 +index 58ae335..c645ffd 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -12,6 +12,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected +@@ -18,6 +18,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp |