From 24d9bf9ec8c1a4e6fae715b1849e355020dd0cd2 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 16 Aug 2018 16:18:13 +0200 Subject: u/fuel: Bump & rebase for default apache ports Change-Id: I9a1ab245a50242d2b3eecfa82fd9c272953aa6d8 Signed-off-by: Alexandru Avadanii --- .../0001-salt-formulas-Add-enable-armband-formula.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch') 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 6ece82b8..0c9bb2c0 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 @@ -42,7 +42,7 @@ Signed-off-by: Alexandru Avadanii create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index 12d6ae65..c122ca0a 100755 +index d7d8cbd4..73c74ee0 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -56,6 +56,7 @@ if salt 'cmp*' match.pillar 'neutron:compute:backend:engine:ovn' \ @@ -54,17 +54,17 @@ index 12d6ae65..c122ca0a 100755 salt -I 'barbican:server' state.sls barbican -b 1 salt -I 'barbican:client' state.sls barbican diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha -index 02530236..95f95a7b 100755 +index 9a42d481..9ca32d0f 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -57,3 +57,5 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer - salt -I 'horizon:server' state.sls horizon + salt -I 'horizon:server' state.sls apache,horizon + +salt -I 'nova:compute' state.sls armband diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 8105b266..cc227a97 100755 +index 8ea5047a..f8ef86b3 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then -- cgit 1.2.3-korg