Merge "Enable stacklight_ssl_enabled by default"
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 22292a8..2a0cd04 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
@@ -495,6 +495,7 @@
barbican_integration_enabled: 'False'
# SSL settings
nova_vnc_tls_enabled: 'True'
+ stacklight_ssl_enabled: 'True'
galera_ssl_enabled: 'True'
openstack_mysql_x509_enabled: 'True'
rabbitmq_ssl_enabled: 'True'
diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml b/tcp_tests/templates/heat-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml
index 1afcf67..bd79379 100644
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml
+++ b/tcp_tests/templates/heat-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml
@@ -93,6 +93,7 @@
dns_server02: 172.18.208.44
email_address: ddmitriev@mirantis.com
etcd_ssl: 'True'
+ stacklight_ssl_enabled: 'True'
infra_bond_mode: active-backup
infra_deploy_nic: eth0
infra_kvm01_control_address: ==IPV4_NET_CONTROL_PREFIX==.241
diff --git a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt-context-cookiecutter-k8s-contrail.yaml b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt-context-cookiecutter-k8s-contrail.yaml
index 599f7d7..0f247b9 100644
--- a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt-context-cookiecutter-k8s-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt-context-cookiecutter-k8s-contrail.yaml
@@ -172,6 +172,7 @@
dns_server02: 1.1.1.1
email_address: sgudz@mirantis.com
etcd_ssl: 'True'
+ stacklight_ssl_enabled: 'True'
gainsight_service_enabled: 'False'
infra_bond_mode: active-backup
infra_deploy_nic: eth0
diff --git a/tcp_tests/templates/heat-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml b/tcp_tests/templates/heat-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
index 4f50b5d..c94de1e 100644
--- a/tcp_tests/templates/heat-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
+++ b/tcp_tests/templates/heat-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
@@ -35,6 +35,7 @@
dns_server02: 172.18.208.44
email_address: ddmitriev@mirantis.com
etcd_ssl: 'True'
+ stacklight_ssl_enabled: 'True'
infra_bond_mode: active-backup
infra_deploy_nic: eth0
infra_kvm01_control_address: ==IPV4_NET_CONTROL_PREFIX==.241
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index fc56b80..9be0372 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -297,6 +297,7 @@
barbican_integration_enabled: 'False'
# SSL settings
nova_vnc_tls_enabled: 'True'
+ stacklight_ssl_enabled: 'True'
galera_ssl_enabled: 'True'
openstack_mysql_x509_enabled: 'True'
rabbitmq_ssl_enabled: 'True'
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 5fc114a..64efa42 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -293,6 +293,7 @@
stacklight_version: '2'
stacklight_long_term_storage_type: prometheus
nova_vnc_tls_enabled: 'True'
+ stacklight_ssl_enabled: 'True'
galera_ssl_enabled: 'True'
openstack_mysql_x509_enabled: 'True'
rabbitmq_ssl_enabled: 'True'
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index aa79b74..3398614 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -377,4 +377,6 @@
minimum_password_age: 0
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
\ No newline at end of file
+ change_password_upon_first_use: False
+
+ stacklight_ssl_enabled: 'True'
\ No newline at end of file