Merge "Enable ssh slave for jenkins in MCP"
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
index f45108a..47192cc 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -930,3 +930,7 @@
password_regex: "'^[a-zA-Z0-9~!@#%^&\\*_=+]{32,}$$'"
password_regex_description: "Your password could contains capital letters, lowercase letters, digits, symbols '~ ! @ # % ^ & * _ = +' and have a minimum length of 32 characters"
change_password_upon_first_use: False
+ secrets_encryption_enabled: 'True'
+ secrets_encryption_key_id: 'F5CB2ADC36159B03'
+ # Used on CI only.
+ secrets_encryption_private_key: ''
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index 835952c..aa424e4 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -932,3 +932,8 @@
password_regex: "'^[a-zA-Z0-9~!@#%^&\\*_=+]{32,}$$'"
password_regex_description: "Your password could contains capital letters, lowercase letters, digits, symbols '~ ! @ # % ^ & * _ = +' and have a minimum length of 32 characters"
change_password_upon_first_use: False
+
+ secrets_encryption_enabled: 'True'
+ secrets_encryption_key_id: 'F5CB2ADC36159B03'
+ # Used on CI only.
+ secrets_encryption_private_key: ''
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index db3b07b..a3b6311 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -117,6 +117,7 @@
mcp_docker_registry: docker-prod-local.docker.mirantis.net
mcp_version: proposed
offline_deployment: 'False'
+ openstack_rabbitmq_standalone_mode: 'True'
opencontrail_analytics_address: ==IPV4_NET_CONTROL_PREFIX==.30
opencontrail_analytics_hostname: nal
opencontrail_analytics_node01_address: ==IPV4_NET_CONTROL_PREFIX==.31