diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-23 19:29:25 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-24 17:28:06 +0000 |
| commit | 1e6be0b7a685fe5c3575bb49843dfa1a12c071fd (patch) | |
| tree | 846f758d0791de6de25494415542081ad040ff0e /patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch | |
| parent | e3cffc6ebd73510294a4e7db9c4c25d01738ed73 (diff) | |
u/fuel: Bump & rebase for maas.machines.storage
Change-Id: I22781c20f353a81e546b1d6de390e6c58b31a494
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 0bd1adfbf11d58414b96d0277386b039a3117a9e)
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 | 13 |
1 files changed, 5 insertions, 8 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 a04780b5..e228b805 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 @@ -44,7 +44,7 @@ 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_ha b/mcp/config/states/openstack_ha -index a30f9af6..600aa76b 100755 +index 73c44bb6..4ac5d6d5 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 @@ -56,18 +56,15 @@ index a30f9af6..600aa76b 100755 salt -I 'redis:cluster:role:master' state.sls redis salt -I 'redis:server' state.sls redis diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha -index a266989a..77557caa 100755 +index 70db238b..52d643df 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha -@@ -55,6 +55,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer +@@ -54,3 +54,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 + - # workaround for the pike horizon is missing css, FUEL-324 - salt -I 'horizon:server' file.symlink \ - /var/lib/openstack-dashboard/static \ ++salt -I 'nova:compute' state.sls armband diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index c391cfe6..02a813c9 100755 --- a/mcp/config/states/virtual_control_plane |