Merge "Update partition sizes for VCP nodes in image-layout.yml"
diff --git a/tcp_tests/managers/k8s/pods.py b/tcp_tests/managers/k8s/pods.py
index 98192a6..4426170 100644
--- a/tcp_tests/managers/k8s/pods.py
+++ b/tcp_tests/managers/k8s/pods.py
@@ -53,7 +53,7 @@
'"{1}"'.format(self.name, phases))
return self
- def wait_running(self, timeout=240, interval=3):
+ def wait_running(self, timeout=600, interval=3):
return self.wait_phase('Running', timeout=timeout, interval=interval)
diff --git a/tcp_tests/managers/k8smanager.py b/tcp_tests/managers/k8smanager.py
index 9b7fa80..d1a9a87 100644
--- a/tcp_tests/managers/k8smanager.py
+++ b/tcp_tests/managers/k8smanager.py
@@ -350,7 +350,7 @@
pod = cnf_pod.read()
status = pod.status.phase
- if status is 'Failed':
+ if status == 'Failed':
describe = "kubectl describe po {0} -n {0}".format(pod_mark)
LOG.info(self.controller_check_call(describe, timeout=30))
raise RuntimeError("Conformance failed")
@@ -390,7 +390,7 @@
:return:
"""
with self.__underlay.remote(node_name=self.controller_name) as remote:
- if system is 'docker':
+ if system == 'docker':
cmd = ("docker ps --all | grep \"{0}\" |"
" awk '{{print $1}}'".format(container))
result = remote.check_call(cmd, raise_on_err=False)
diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index a354d01..a45663b 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -59,10 +59,9 @@
@property
def target_name(self):
if not self.__target_name:
- result = self.salt_api.get_pillar(
+ target_host = self.__salt_api.get_single_pillar(
tgt=self.master_name,
pillar="runtest:tempest:test_target")
- target_host = (result[0].get(self.master_name))
if target_host[-1] == "*":
target_host = target_host[:-1]
self.__target_name = self.underlay.get_target_node_names(
@@ -104,6 +103,10 @@
def prepare(self):
salt_call_cmd = "salt-call -l info --hard-crash --state-output=mixed "
+ barbican_integration = self.__salt_api.get_single_pillar(
+ tgt="I@barbican:client and ctl*",
+ pillar="_param:barbican_integration_enabled")
+ LOG.info("barbican_integration: {}".format(barbican_integration))
commands = [
{
'description': ("Install docker-ce package and "
@@ -125,6 +128,20 @@
"salt-run state.orchestrate " +
"runtest.orchestrate.tempest")},
]
+
+ if barbican_integration == 'True':
+ commands.append({
+ 'description': "Configure barbican",
+ 'node_name': self.master_name,
+ 'cmd': ("set -ex;" +
+ salt_call_cmd +
+ " state.sls barbican.client && " +
+ salt_call_cmd +
+ " state.sls runtest.test_accounts && " +
+ salt_call_cmd +
+ " state.sls runtest.barbican_sign_image")},
+ )
+
self.__salt_api.execute_commands(commands=commands,
label="Prepare for Tempest")
@@ -134,6 +151,7 @@
docker_args = (
" -t "
+ " --net host "
" --name {container_name} "
" -e ARGS=\"-r {tempest_pattern} -w {tempest_threads}\""
" -v {cfg_dir}/tempest.conf:/etc/tempest/tempest.conf"
diff --git a/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-cookiecutter-k8s-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-cookiecutter-k8s-contrail.yaml
index e2bbdb7..81dfa50 100644
--- a/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-cookiecutter-k8s-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/salt-context-cookiecutter-k8s-contrail.yaml
@@ -358,3 +358,5 @@
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'True'
vnf_onboarding_enabled: 'False'
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/lab04-physical-inventory.yaml
index ce0fa39..69fa20e 100644
--- a/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/lab04-physical-inventory.yaml
@@ -4,6 +4,7 @@
roles:
- infra_config
- linux_system_codename_xenial
+ - features_runtest_cfg
interfaces:
ens3:
role: single_static_mgm
diff --git a/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/salt-context-cookiecutter-contrail.yaml
index 14b14b5..da08af4 100644
--- a/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/salt-context-cookiecutter-contrail.yaml
@@ -433,3 +433,5 @@
#ceph_rgw_node03_deploy_address: "172.16.48.78"
ceph_rgw_node03_address: "10.167.8.78"
ceph_rgw_node03_hostname: "rgw03"
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/lab04-physical-inventory.yaml
index 73f316a..01e14b1 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/lab04-physical-inventory.yaml
@@ -4,6 +4,7 @@
roles:
- infra_config
- linux_system_codename_xenial
+ - features_runtest_cfg
interfaces:
ens3:
role: single_static_mgm
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/salt-context-cookiecutter-contrail.yaml
index 1660afc..9ec17de 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/salt-context-cookiecutter-contrail.yaml
@@ -447,3 +447,5 @@
#ceph_rgw_node03_deploy_address: "172.16.48.78"
ceph_rgw_node03_address: "10.167.8.78"
ceph_rgw_node03_hostname: "rgw03"
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/lab04-physical-inventory.yaml
index 4d3ffd6..e1b92fb 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/lab04-physical-inventory.yaml
@@ -4,9 +4,10 @@
roles:
- infra_config
- linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_static_mgm
+ - features_runtest_cfg
+ interfaces:
+ ens3:
+ role: single_static_mgm
ens4:
role: single_static_ctl
# Physical nodes
@@ -18,11 +19,11 @@
- linux_system_codename_xenial
interfaces:
one1:
- role: single_dhcp
+ role: single_dhcp
one2:
role: bond0_ab_ovs_vlan_ctl
- ten1:
- role: single_mgm_manual
+ ten1:
+ role: single_mgm_manual
kvm02.cookied-cicd-bm-os-contrail40-maas.local:
reclass_storage_name: infra_kvm_node02
@@ -31,11 +32,11 @@
- linux_system_codename_xenial
interfaces:
one1:
- role: single_dhcp
+ role: single_dhcp
one2:
role: bond0_ab_ovs_vlan_ctl
- ten1:
- role: single_mgm_manual
+ ten1:
+ role: single_mgm_manual
kvm03.cookied-cicd-bm-os-contrail40-maas.local:
reclass_storage_name: infra_kvm_node03
@@ -44,11 +45,11 @@
- linux_system_codename_xenial
interfaces:
one1:
- role: single_dhcp
+ role: single_dhcp
one2:
role: bond0_ab_ovs_vlan_ctl
- ten1:
- role: single_mgm_manual
+ ten1:
+ role: single_mgm_manual
osd<<count>>:
reclass_storage_name: ceph_osd_rack01
@@ -57,10 +58,10 @@
- linux_system_codename_xenial
interfaces:
one1:
- role: single_dhcp
+ role: single_dhcp
one2:
role: single_vlan_ctl
-# role: bond0_ab_vlan_ceph_storage_backend
+# role: bond0_ab_vlan_ceph_storage_backend
cmp<<count>>:
reclass_storage_name: openstack_compute_rack01
@@ -68,9 +69,9 @@
- openstack_compute
- linux_system_codename_xenial
interfaces:
- #one1: unused
+ #one1: unused
one2:
- role: single_dhcp
+ role: single_dhcp
ten1:
role: bond0_ab_contrail
ten2:
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/salt-context-cookiecutter-contrail.yaml
index 23ee1d2..29ad5cf 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas-2018.8.0/salt-context-cookiecutter-contrail.yaml
@@ -447,3 +447,5 @@
#ceph_rgw_node03_deploy_address: "172.16.48.78"
ceph_rgw_node03_address: "10.167.8.78"
ceph_rgw_node03_hostname: "rgw03"
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/lab04-physical-inventory.yaml
index 0cec934..27b5d25 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/lab04-physical-inventory.yaml
@@ -4,6 +4,7 @@
roles:
- infra_config
- linux_system_codename_xenial
+ - features_runtest_cfg
interfaces:
ens3:
role: single_static_mgm
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
index efcfc73..75c3907 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
@@ -433,3 +433,5 @@
#ceph_rgw_node03_deploy_address: "172.16.48.78"
ceph_rgw_node03_address: "10.167.8.78"
ceph_rgw_node03_hostname: "rgw03"
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/lab04-physical-inventory.yaml
index 55241ac..1952ac8 100644
--- a/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/lab04-physical-inventory.yaml
@@ -4,6 +4,7 @@
roles:
- infra_config
- linux_system_codename_xenial
+ - features_runtest_cfg
interfaces:
ens3:
role: single_static_mgm
diff --git a/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/salt-context-cookiecutter-contrail.yaml
index fdc4d1c..9d00697 100644
--- a/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/salt-context-cookiecutter-contrail.yaml
@@ -433,3 +433,5 @@
#ceph_rgw_node03_deploy_address: "172.16.48.78"
ceph_rgw_node03_address: "10.167.8.78"
ceph_rgw_node03_hostname: "rgw03"
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml
index 438696b..f288899 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml
@@ -206,4 +206,6 @@
tenant_vlan: '20'
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'False'
- vnf_onboarding_enabled: 'False'
\ No newline at end of file
+ vnf_onboarding_enabled: 'False'
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico/cookiecutter-context-k8s.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico/cookiecutter-context-k8s.yaml
index b8bda7e..a531d95 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico/cookiecutter-context-k8s.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico/cookiecutter-context-k8s.yaml
@@ -172,4 +172,6 @@
tenant_network_subnet: 10.167.6.0/24
tenant_vlan: '20'
upstream_proxy_enabled: 'False'
- use_default_network_scheme: 'False'
\ No newline at end of file
+ use_default_network_scheme: 'False'
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
index 7352614..c11154d 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
@@ -177,10 +177,10 @@
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'False'
vnf_onboarding_enabled: 'False'
-
- kubernetes_network_calico_enabled: 'True'
kubernetes_network_flannel_enabled: 'True'
flannel_network: 10.20.0.0/16
kubernetes_network_genie_enabled: 'True'
kubernetes_genie_default_plugin: 'calico'
kubernetes_virtlet_enabled: 'True'
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 335b2d0..20902a4 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -498,6 +498,7 @@
openstack_mysql_x509_enabled: 'True'
rabbitmq_ssl_enabled: 'True'
openstack_rabbitmq_x509_enabled: 'True'
+ openstack_internal_protocol: 'https'
tenant_telemetry_enabled: 'True'
gnocchi_aggregation_storage: ceph
openstack_telemetry_address: 10.167.11.83
@@ -510,6 +511,7 @@
openstack_telemetry_node03_hostname: mdb03
barbican_backend: dogtag
barbican_enabled: 'True'
+ barbican_integration_enabled: 'False'
openstack_barbican_address: 10.167.11.44
openstack_barbican_hostname: kmn
openstack_barbican_node01_address: 10.167.11.45
@@ -527,3 +529,42 @@
storage_vlan: '2405' # not implemented yet, placeholder
kqueen_custom_mail_enabled: 'False'
kqueen_enabled: 'False'
+ manila_enabled: 'False'
+ octavia_health_manager_node01_address: 192.168.1.10
+ octavia_health_manager_node02_address: 192.168.1.11
+ octavia_health_manager_node03_address: 192.168.1.12
+ octavia_manager_cluster: 'True'
+ octavia_hm_bind_ip: 192.168.1.12
+ octavia_lb_mgmt_cidr: 192.168.1.0/24
+ octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
+ octavia_lb_mgmt_allocation_pool_end: 192.168.1.200
+ openstack_octavia_enabled: 'True'
+ octavia_private_key: |-
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEpAIBAAKCAQEAtjnPDJsQToHBtoqIo15mdSYpfi8z6DFMi8Gbo0KCN33OUn5u
+ OctbdtjUfeuhvI6px1SCnvyWi09Ft8eWwq+KwLCGKbUxLvqKltuJ7K3LIrGXkt+m
+ qZN4O9XKeVKfZH+mQWkkxRWgX2r8RKNV3GkdNtd74VjhP+R6XSKJQ1Z8b7eHM10v
+ 6IjTY/jPczjK+eyCeEj4qbSnV8eKlqLhhquuSQRmUO2DRSjLVdpdf2BB4/BdWFsD
+ YOmX7mb8kpEr9vQ+c1JKMXDwD6ehzyU8kE+1kVm5zOeEy4HdYIMpvUfN49P1anRV
+ 2ISQ1ZE+r22IAMKl0tekrGH0e/1NP1DF5rINMwIDAQABAoIBAQCkP/cgpaRNHyg8
+ ISKIHs67SWqdEm73G3ijgB+JSKmW2w7dzJgN//6xYUAnP/zIuM7PnJ0gMQyBBTMS
+ NBTv5spqZLKJZYivj6Tb1Ya8jupKm0jEWlMfBo2ZYVrfgFmrfGOfEebSvmuPlh9M
+ vuzlftmWVSSUOkjODmM9D6QpzgrbpktBuA/WpX+6esMTwJpOcQ5xZWEnHXnVzuTc
+ SncodVweE4gz6F1qorbqIJz8UAUQ5T0OZTdHzIS1IbamACHWaxQfixAO2s4+BoUK
+ ANGGZWkfneCxx7lthvY8DiKn7M5cSRnqFyDToGqaLezdkMNlGC7v3U11FF5blSEW
+ fL1o/HwBAoGBAOavhTr8eqezTchqZvarorFIq7HFWk/l0vguIotu6/wlh1V/KdF+
+ aLLHgPgJ5j+RrCMvTBoKqMeeHfVGrS2udEy8L1mK6b3meG+tMxU05OA55abmhYn7
+ 7vF0q8XJmYIHIXmuCgF90R8Piscb0eaMlmHW9unKTKo8EOs5j+D8+AMJAoGBAMo4
+ 8WW+D3XiD7fsymsfXalf7VpAt/H834QTbNZJweUWhg11eLutyahyyfjjHV200nNZ
+ cnU09DWKpBbLg7d1pyT69CNLXpNnxuWCt8oiUjhWCUpNqVm2nDJbUdlRFTzYb2fS
+ ZC4r0oQaPD5kMLSipjcwzMWe0PniySxNvKXKInFbAoGBAKxW2qD7uKKKuQSOQUft
+ aAksMmEIAHWKTDdvOA2VG6XvX5DHBLXmy08s7rPfqW06ZjCPCDq4Velzvgvc9koX
+ d/lP6cvqlL9za+x6p5wjPQ4rEt/CfmdcmOE4eY+1EgLrUt314LHGjjG3ScWAiirE
+ QyDrGOIGaYoQf89L3KqIMr0JAoGARYAklw8nSSCUvmXHe+Gf0yKA9M/haG28dCwo
+ 780RsqZ3FBEXmYk1EYvCFqQX56jJ25MWX2n/tJcdpifz8Q2ikHcfiTHSI187YI34
+ lKQPFgWb08m1NnwoWrY//yx63BqWz1vjymqNQ5GwutC8XJi5/6Xp+tGGiRuEgJGH
+ EIPUKpkCgYAjBIVMkpNiLCREZ6b+qjrPV96ed3iTUt7TqP7yGlFI/OkORFS38xqC
+ hBP6Fk8iNWuOWQD+ohM/vMMnvIhk5jwlcwn+kF0ra04gi5KBFWSh/ddWMJxUtPC1
+ 2htvlEc6zQAR6QfqXHmwhg1hP81JcpqpicQzCMhkzLoR1DC6stXdLg==
+ -----END RSA PRIVATE KEY-----
+ octavia_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2Oc8MmxBOgcG2ioijXmZ1Jil+LzPoMUyLwZujQoI3fc5Sfm45y1t22NR966G8jqnHVIKe/JaLT0W3x5bCr4rAsIYptTEu+oqW24nsrcsisZeS36apk3g71cp5Up9kf6ZBaSTFFaBfavxEo1XcaR0213vhWOE/5HpdIolDVnxvt4czXS/oiNNj+M9zOMr57IJ4SPiptKdXx4qWouGGq65JBGZQ7YNFKMtV2l1/YEHj8F1YWwNg6ZfuZvySkSv29D5zUkoxcPAPp6HPJTyQT7WRWbnM54TLgd1ggym9R83j0/VqdFXYhJDVkT6vbYgAwqXS16SsYfR7/U0/UMXmsg0z
diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
index c4fae7b..aa0d838 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
@@ -4,7 +4,7 @@
roles:
- infra_config
- linux_system_codename_xenial
- - features_runtest
+ - features_runtest_cfg
interfaces:
ens3:
role: single_static_mgm
@@ -73,8 +73,6 @@
roles:
- openstack_gateway
- linux_system_codename_xenial
- classes:
- - system.linux.system.repo.mcp.apt_mirantis.docker
interfaces:
enp3s0f0:
role: single_mgm_dhcp
diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml
index 150e001..2016eed 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml
@@ -209,3 +209,5 @@
openstack_public_neutron_subnet_cidr: 172.17.16.0/24
openstack_public_neutron_subnet_allocation_start: 172.17.16.201
openstack_public_neutron_subnet_allocation_end: 172.17.16.245
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
index bef76b3..26f7983 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
@@ -4,6 +4,7 @@
roles:
- infra_config
- linux_system_codename_xenial
+ - features_runtest
interfaces:
ens3:
role: single_dhcp
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
index 8e06b18..30671a1 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
@@ -300,3 +300,5 @@
openstack_public_neutron_subnet_cidr: 172.17.16.0/24
openstack_public_neutron_subnet_allocation_start: 172.17.16.201
openstack_public_neutron_subnet_allocation_end: 172.17.16.245
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/cookiecutter-context-pike-dvr-sl.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/cookiecutter-context-pike-dvr-sl.yaml
index 3f5da39..8fc7181 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/cookiecutter-context-pike-dvr-sl.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/cookiecutter-context-pike-dvr-sl.yaml
@@ -236,4 +236,6 @@
openstack_public_neutron_subnet_gateway: 172.17.16.1
openstack_public_neutron_subnet_cidr: 172.17.16.0/24
openstack_public_neutron_subnet_allocation_start: 172.17.16.201
- openstack_public_neutron_subnet_allocation_end: 172.17.16.245
\ No newline at end of file
+ openstack_public_neutron_subnet_allocation_end: 172.17.16.245
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml
index 77d8229..065d10f 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml
@@ -4,6 +4,7 @@
roles:
- infra_config
- linux_system_codename_xenial
+ - features_runtest
classes:
- environment.cookied-cicd-pike-dvr-sl.override_ntp_virtual
interfaces:
diff --git a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/cookiecutter-context-pike-ovs-sl.yaml b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/cookiecutter-context-pike-ovs-sl.yaml
index 6a25c5f..d459d32 100644
--- a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/cookiecutter-context-pike-ovs-sl.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/cookiecutter-context-pike-ovs-sl.yaml
@@ -275,3 +275,5 @@
openstack_public_neutron_subnet_cidr: 172.17.16.0/24
openstack_public_neutron_subnet_allocation_start: 172.17.16.201
openstack_public_neutron_subnet_allocation_end: 172.17.16.245
+ manila_enabled: 'False'
+ barbican_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/environment-context.yaml b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/environment-context.yaml
index 6ffc515..be99dbb 100644
--- a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/environment-context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/environment-context.yaml
@@ -4,6 +4,7 @@
roles:
- infra_config
- linux_system_codename_xenial
+ - features_runtest
interfaces:
ens3:
role: single_dhcp
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml
index 771cec4..c3c3ec9 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml
@@ -275,4 +275,6 @@
openstack_public_neutron_subnet_cidr: 172.17.16.0/24
openstack_public_neutron_subnet_allocation_start: 172.17.16.201
openstack_public_neutron_subnet_allocation_end: 172.17.16.245
+ manila_enabled: 'False'
+ barbican_enabled: 'False'