Add designate, fix tempest runner
Change-Id: I5c86b5214553632497f8b868dffbe1ca0621a306
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml
index ab39f0b..c2e88f6 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/openstack.yaml
@@ -122,6 +122,21 @@
retry: {count: 1, delay: 5}
skip_fail: false
+# Install designate
+- description: Install powerdns
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+ -C 'ctl*' state.sls powerdns
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+
+- description: Install designate
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+ -C 'I@designate:server' state.sls designate -b 1
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 5, delay: 10}
+ skip_fail: false
+
- description: Check neutron agent-list
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-C 'I@keystone:server' cmd.run '. /root/keystonerc; neutron agent-list'
@@ -295,9 +310,9 @@
- description: Run tests
cmd: |
if [[ {{ PATTERN }} == "false" ]]; then
- docker run --rm --net=host -e SOURCE_FILE=/home/rally/keystonercv3 -e LOG_DIR=/home/rally/rally_reports/all -e SET=full -e CUSTOM="--pattern tempest --detail" -e CONCURRENCY=2 -e TEMPEST_CONF=lvm_mcp.conf -e SKIP_LIST=mcp_skip.list -e DO_CLEANUP_RESOURCES=false -v /root/keystonercv3:/home/rally/keystonercv3 -v /root/rally_reports:/home/rally/rally_reports -v /etc/ssl/certs/:/etc/ssl/certs/ docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest else
+ docker run --rm --net=host -e SOURCE_FILE=/home/rally/keystonercv3 -e SET=full -e CUSTOM="--pattern tempest --detail" -e CONCURRENCY=2 -e TEMPEST_CONF=lvm_mcp.conf -e SKIP_LIST=mcp_skip.list -e DO_CLEANUP_RESOURCES=false -v /root/keystonercv3:/home/rally/keystonercv3 -v /root/rally_reports:/home/rally/rally_reports -v /etc/ssl/certs/:/etc/ssl/certs/ docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest else
else
- docker run --rm --net=host -e SOURCE_FILE=/home/rally/keystonercv3 -e LOG_DIR=/home/rally/rally_reports/all -e SET=full -e CUSTOM="--pattern {{ PATTERN }} --detail" -e CONCURRENCY=2 -e TEMPEST_CONF=lvm_mcp.conf -e SKIP_LIST=mcp_skip.list -e DO_CLEANUP_RESOURCES=false -v /root/keystonercv3:/home/rally/keystonercv3 -v /root/rally_reports:/home/rally/rally_reports -v /etc/ssl/certs/:/etc/ssl/certs/ docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest else
+ docker run --rm --net=host -e SOURCE_FILE=/home/rally/keystonercv3 -e SET=full -e CUSTOM="--pattern {{ PATTERN }} --detail" -e CONCURRENCY=2 -e TEMPEST_CONF=lvm_mcp.conf -e SKIP_LIST=mcp_skip.list -e DO_CLEANUP_RESOURCES=false -v /root/keystonercv3:/home/rally/keystonercv3 -v /root/rally_reports:/home/rally/rally_reports -v /etc/ssl/certs/:/etc/ssl/certs/ docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest else
fi
node_name: {{ HOSTNAME_GTW01 }}
retry: {count: 1, delay: 5}
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml
index ab61036..a0bfc84 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml
@@ -3,6 +3,8 @@
reclass_storage_name: openstack_control_node01
roles:
- openstack_control_leader
+ - features_designate
+ - features_designate_keystone
- linux_system_codename_xenial
interfaces:
ens2:
@@ -14,6 +16,7 @@
reclass_storage_name: openstack_control_node02
roles:
- openstack_control
+ - features_designate
- linux_system_codename_xenial
interfaces:
ens2:
@@ -25,6 +28,7 @@
reclass_storage_name: openstack_control_node03
roles:
- openstack_control
+ - features_designate
- linux_system_codename_xenial
interfaces:
ens2:
@@ -36,6 +40,7 @@
reclass_storage_name: openstack_database_node01
roles:
- openstack_database_leader
+ - features_designate_database
- linux_system_codename_xenial
interfaces:
ens3:
@@ -45,6 +50,7 @@
reclass_storage_name: openstack_database_node02
roles:
- openstack_database
+ - features_designate_database
- linux_system_codename_xenial
interfaces:
ens3:
@@ -54,6 +60,7 @@
reclass_storage_name: openstack_database_node03
roles:
- openstack_database
+ - features_designate_database
- linux_system_codename_xenial
interfaces:
ens3: