Merge "Change interface roles for heat based envs"
diff --git a/jobs/pipelines/swarm-create-cfg-config-drive.groovy b/jobs/pipelines/swarm-create-cfg-config-drive.groovy
index 2c16eb4..10d0e5d 100644
--- a/jobs/pipelines/swarm-create-cfg-config-drive.groovy
+++ b/jobs/pipelines/swarm-create-cfg-config-drive.groovy
@@ -68,7 +68,7 @@
eval \$(ssh-agent)
ssh-add ${GERRIT_KEY}
cd mcp-common-scripts-git
- git fetch ssh://${GERRIT_USERNAME}@gerrit.mcp.mirantis.com:29418/mcp/mcp-common-scripts ${MCP_COMMON_SCRIPTS_REFS} && git checkout FETCH_HEAD
+ git fetch https://gerrit.mcp.mirantis.com/mcp/mcp-common-scripts ${MCP_COMMON_SCRIPTS_REFS} && git checkout FETCH_HEAD
git log -1
""")
}
diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
index b7e703f..9dc313a 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
@@ -48,7 +48,7 @@
default: 172.16.164.61
salt_master_control_ip:
type: string
- default: 10.167.11.15
+ default: 10.167.11.5
resources:
subnets:
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
index 19b5fac..03c5679 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
@@ -48,7 +48,7 @@
default: 172.16.164.61
salt_master_control_ip:
type: string
- default: 10.167.11.15
+ default: 10.167.11.5
resources:
subnets:
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 2a0cd04..3ee6bae 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
@@ -503,3 +503,13 @@
openstack_internal_protocol: 'https'
cinder_backup_engine: 'ceph'
cinder_ceph_backup_pool_name: 'backups'
+ openstack_keystone_security:
+ disable_user_account_days_inactive: 7
+ lockout_failure_attempts: 60
+ lockout_duration: 600
+ password_expires_days: 730
+ unique_last_password_count: 5
+ 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
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 9be0372..151dee8 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
@@ -303,3 +303,13 @@
rabbitmq_ssl_enabled: 'True'
openstack_rabbitmq_x509_enabled: 'True'
openstack_internal_protocol: 'https'
+ openstack_keystone_security:
+ disable_user_account_days_inactive: 7
+ lockout_failure_attempts: 60
+ lockout_duration: 600
+ password_expires_days: 730
+ unique_last_password_count: 5
+ 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