diff options
4 files changed, 13 insertions, 13 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 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 <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 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 diff --git a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch index 9a23ac1f..b6194695 100644 --- a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch @@ -34,7 +34,7 @@ index 14d6a570..1317900a 100755 wait_for 5.0 "salt -C '${cluster_nodes_query}' state.apply salt.minion" wait_for 5.0 "salt -C '${compute_nodes_query}' state.apply linux.system,linux.network" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index cc227a97..51823a0c 100755 +index f8ef86b3..40849e66 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -39,6 +39,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no @@ -46,13 +46,13 @@ index cc227a97..51823a0c 100755 # Propagate APT proxy config created by curtin on baremetal nodes to VCP VMs diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 -index 987c5eb2..afeadc80 100644 +index fb1dcacd..530f85e1 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 -@@ -11,6 +11,9 @@ classes: - - cluster.all-mcp-arch-common.opnfv - parameters: +@@ -13,6 +13,9 @@ parameters: _param: + openstack_version: queens + + opnfv_user_username: opnfv + opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1 + diff --git a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch index cc1c5aad..3a3e69c5 100644 --- a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch +++ b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch @@ -17,10 +17,10 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 -index 33c74fda..4e728dc4 100644 +index f9fe73ae..a10ff801 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 -@@ -89,7 +89,7 @@ parameters: +@@ -90,7 +90,7 @@ parameters: <<: *db_conn_recycle_time cacert: /etc/ssl/certs/mcp_os_cacert openrc_extra: @@ -30,10 +30,10 @@ index 33c74fda..4e728dc4 100644 server: <<: *db_conn_recycle_time diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml -index 0eeff7c0..0c7b5472 100644 +index 8ba9c696..3cad66dc 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml -@@ -77,7 +77,7 @@ parameters: +@@ -78,7 +78,7 @@ parameters: server: admin_email: ${_param:admin_email} openrc_extra: diff --git a/upstream/fuel b/upstream/fuel -Subproject 544ff4f35b2b449d25272a8805bbb4c7f748f1d +Subproject 8de9c24300817b9d0ce4f2bfb2ab63643d895a1 |