diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-26 01:05:39 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-26 01:19:16 +0100 |
| commit | 709976cdb4cec03c51cefcb04cef4cc160a7508b (patch) | |
| tree | e4795298e0e38009546b7cb4dffad168af0e7c8a /patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch | |
| parent | d951b65660af591913e6e6315e6fe5a9e40d6551 (diff) | |
u/fuel: Bump & rebase for pharos as lab-config
Change-Id: I78672282dd0bf98509bb2f0848a4df542564d418
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch')
| -rw-r--r-- | patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch index 9f68465a..9d7b25b2 100644 --- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0002-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 4948a50..93c73e7 100755 +index 0bbf7cd..c49b27d 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,15 +56,18 @@ index 4948a50..93c73e7 100755 salt -C 'I@mongodb:server and *01*' state.sls mongodb || true wait_for 10 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha -index bcb7807..09b84b9 100755 +index 9fc30bb..998fc6b 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha -@@ -51,3 +51,5 @@ salt -I 'ceilometer:server' state.sls ceilometer - salt -I 'ceilometer:agent' state.sls ceilometer +@@ -52,6 +52,8 @@ 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 \ diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 75347d9..8b162d5 100755 --- a/mcp/config/states/virtual_control_plane |