diff options
Diffstat (limited to 'patches/opnfv-fuel')
| -rw-r--r-- | patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch | 10 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch | 8 |
2 files changed, 9 insertions, 9 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 1e986544..50687698 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 73c44bb6..4ac5d6d5 100755 +index f0809042..91c7e2f7 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 @@ -51,13 +51,13 @@ index 73c44bb6..4ac5d6d5 100755 salt -I 'nova:compute' state.sls nova +wait_for 5.0 "salt -I 'nova:compute' state.sls armband" - salt -I 'redis:cluster:role:master' state.sls redis - salt -I 'redis:server' state.sls redis + 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 70db238b..52d643df 100755 +index 02530236..95f95a7b 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha -@@ -54,3 +54,5 @@ salt -I 'ceilometer:server' state.sls ceilometer +@@ -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 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 0cfae945..0a19c02a 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 0189e038..ea758c4b 100644 +index 28d727ea..edf91162 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 -@@ -84,7 +84,7 @@ parameters: +@@ -89,7 +89,7 @@ parameters: <<: *db_conn_recycle_time cacert: /etc/ssl/certs/mcp_os_cacert openrc_extra: @@ -30,10 +30,10 @@ index 0189e038..ea758c4b 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 f458281c..e17a5f16 100644 +index 0eeff7c0..0c7b5472 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml -@@ -72,7 +72,7 @@ parameters: +@@ -77,7 +77,7 @@ parameters: server: admin_email: ${_param:admin_email} openrc_extra: |