Merge "Fix network for cicd-bm-k8s model"
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 759e716..02dc2f6 100644
--- a/tcp_tests/managers/k8smanager.py
+++ b/tcp_tests/managers/k8smanager.py
@@ -167,7 +167,7 @@
:return: str, IP address
"""
ctl_vip_pillar = self._salt.get_pillar(
- tgt="I@kubernetes:control:enabled:True",
+ tgt="I@kubernetes:control",
pillar="_param:cluster_vip_address")[0]
return ctl_vip_pillar.values()[0]
@@ -349,14 +349,14 @@
LOG.info("Waiting for Conformance to complete")
helpers.wait(
- lambda: cnf_status() == ('Succeeded' or 'Failed'),
+ lambda: cnf_status() in ('Succeeded', 'Failed'),
interval=120, timeout=timeout,
timeout_msg="Timeout for Conformance reached."
)
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")
@@ -396,7 +396,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..7325e2e 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,11 @@
def prepare(self):
salt_call_cmd = "salt-call -l info --hard-crash --state-output=mixed "
+ barbican_integration = self.__salt_api.get_single_pillar(
+ tgt="ctl01*",
+ pillar="_param:barbican_integration_enabled")
+
+ LOG.info("Barbican integration {0}".format(barbican_integration))
commands = [
{
'description': ("Install docker-ce package and "
@@ -125,6 +129,20 @@
"salt-run state.orchestrate " +
"runtest.orchestrate.tempest")},
]
+
+ if barbican_integration:
+ 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 +152,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/report.py b/tcp_tests/report.py
index 03530d6..0bec6ef 100644
--- a/tcp_tests/report.py
+++ b/tcp_tests/report.py
@@ -9,6 +9,7 @@
from testrail import TestRail
from testrail.test import Test
+# from testrail_api import APIClient
from functools32 import lru_cache
logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.INFO)
@@ -28,6 +29,11 @@
"create-report",
help="Create summary report",
description="Create summary report")
+ cli_process_link = commands.add_parser(
+ "mark-fails",
+ help="Extract linked bugs from previous reports",
+ description="Extract linked bugs from previous reports"
+ " and mark current")
cli_process.add_argument(
"-T", "--testrail-host", dest="testrail_host",
required=True,
@@ -77,6 +83,39 @@
required=True,
help="JIRA user password")
+ # link fail bugs parameters
+ cli_process_link.add_argument(
+ "-T", "--testrail-host", dest="testrail_host",
+ required=True,
+ help="TestRail hostname")
+ cli_process_link.add_argument(
+ "-U", "--testrail-user", dest="testrail_user",
+ required=True,
+ help="TestRail user email")
+ cli_process_link.add_argument(
+ "-K", "--testrail-user-key", dest="testrail_user_key",
+ required=True,
+ help="TestRail user key")
+ cli_process_link.add_argument(
+ "-R", "--testrail-plan", dest="testrail_plan",
+ required=True,
+ help="TestRail test plan for analize")
+ cli_process_link.add_argument(
+ "-M", "--testrail-marked-plan", dest="testrail_marked_plan",
+ required=False,
+ help="TestRail test plan for parse")
+ cli_process_link.add_argument(
+ "-P", "--testrail-project", dest="testrail_project",
+ required=True,
+ help="TestRail project name")
+ cli_process_link.add_argument(
+ "--testrail-only-run", dest="testrail_only_run",
+ help="Name to update only specified run in selected plan")
+ cli_process_link.add_argument(
+ "--push-to-testrail", dest="update_report_flag", action="store_true",
+ default=False,
+ help="Save report in plan description")
+
if len(sys.argv) == 1:
cli.print_help()
sys.exit(1)
@@ -107,6 +146,19 @@
return ret
+def get_all_failed_results(t_client, list_of_runs, result_type):
+ """
+ returned result format:
+ [[run(id,name), result(id,status,defects...), test(id,name..)],
+ [run(id,name), result(id,status,defects...), test(id,name..)],
+ ...]
+ """
+ ret = []
+ for run in list_of_runs:
+ ret.extend(get_failed_results(t_client, run, result_type))
+ return ret
+
+
@lru_cache()
def fetch_test(api, test_id, run_id):
return Test(api.test_with_id(test_id, run_id))
@@ -126,6 +178,72 @@
return ret
+def get_failed_results(t_client, run, result_type):
+ """
+ returned result format:
+ [run(id,name),
+ result(id,status,defects...),
+ test(id,name..)]
+ """
+ LOG.info("Get results for run - {}".format(run.name))
+ results = t_client.results(run, result_type)
+ results_with_test = []
+ if result_type is '5':
+ ret = [(run, r) for r in results
+ if r.raw_data()['status_id'] is int(result_type) and
+ r.raw_data()['defects'] is None]
+ else:
+ ret = [(run, r) for r in results
+ if r.raw_data()['status_id'] is not None and
+ r.raw_data()['defects'] is not None]
+ for r in ret:
+ run, result = r
+ test = fetch_test(result.api, result.raw_data()['test_id'], run.id)
+ LOG.info("Test {} - {} - {} - {}"
+ .format(test.title, result.status.name,
+ result.raw_data()['status_id'],
+ ','.join(result.defects)))
+ results_with_test.append([run, result, test])
+ return results_with_test
+
+
+def mark_failed_results(t_cl, marked_res, failed_res, t_h):
+ """
+ Extract list tests with defect and compare it with tests to be marked,
+ and add defects and result from marked tests
+ Returned result format:
+ [[target_tests_to_update_with_defect, target_run_id],
+ [target_tests_to_update_with_defect, target_run_id],
+ ...]
+ """
+ LOG.info("Extract marked tests and attach to failed")
+
+ def generate_result(t_c, tst, m_r, m_t):
+ link_comment = "{url}/index.php?/tests/view/{uid}".format(
+ url=t_h, uid=m_t.id)
+ tmp_result = t_c.result()
+ tmp_result.test = tst
+ tmp_result.status = m_r.status
+ tmp_result.comment = "Result taked from: " + link_comment
+ tmp_result.defects = [str(m_r.defects[0])]
+ return tmp_result
+
+ # def check_if_marked():
+ # if ret.count()
+
+ ret = []
+ for run, result, test in failed_res:
+ for m_run, m_result, m_test in marked_res:
+ if run.name == m_run.name \
+ and test.title == m_test.title:
+ LOG.info(" MARKED FOUND: Run:{} test: .. {}-{}"
+ .format(run.id, test.title[-72:],
+ m_result.defects[0]))
+ ret.append([generate_result(t_cl, test, m_result,
+ m_test), run.id])
+ return ret
+
+
@lru_cache()
def get_defect_info(j_client, defect):
LOG.info("Get info about issue {}".format(defect))
@@ -230,7 +348,7 @@
"title": test.title.replace('[', '{').replace(']', '}'),
"uid": test.id,
"link": "{url}/index.php?/tests/view/{uid}".format(
- url=test.api._conf()['url'], uid=test.id)
+ url=test.api._conf()['url'], uid=test.id)
}
def list_of_defect_tests(results):
@@ -278,12 +396,12 @@
"title": test.title,
"uid": test.id,
"link": "{url}/index.php?/tests/view/{uid}".format(
- url=test.api._conf()['url'], uid=test.id)
+ url=test.api._conf()['url'], uid=test.id)
}
def list_of_defect_tests(results):
ret = ["<a href='{link}'>{title} #{uid}</a>".format(
- **title_uid_link(r)) for r in results]
+ **title_uid_link(r)) for r in results]
return ' '.join(ret)
for k in table:
@@ -318,8 +436,8 @@
text = "Bugs Statistics (generated on {date})\n" \
"=======================================================\n" \
"{table}".format(
- date=datetime.datetime.now().strftime("%a %b %d %H:%M:%S %Y"),
- table=get_md_table(table))
+ date=datetime.datetime.now().strftime("%a %b %d %H:%M:%S %Y"),
+ table=get_md_table(table))
plan = t_client.plan(plan_name)
if plan:
plan.description = text
@@ -332,6 +450,17 @@
})
+def update_report(t_client, plan_name, tests_table):
+ LOG.info("Update report table into plan - {}".format(plan_name)
+ + "\n===\nList tests to udate:")
+ plan = t_client.plan(plan_name)
+ if plan:
+ for r_test, run in tests_table:
+ t_client.add(r_test)
+ print(r_test.test.title)
+ LOG.info("\n===\nUpdate plan finished - {}".format(plan_name))
+
+
def create_report(**kwargs):
j_host = kwargs.get('jira_host')
j_user = kwargs.get('jira_user_id')
@@ -359,8 +488,50 @@
push_report(t_client, t_plan, table)
+def mark_fails(**kwargs):
+ testrail_host = kwargs.get('testrail_host')
+ testrail_user = kwargs.get('testrail_user')
+ testrail_user_key = kwargs.get('testrail_user_key')
+ testrail_plan = kwargs.get('testrail_plan')
+ testrail_m_plan = kwargs.get('testrail_marked_plan')
+ testrail_project = kwargs.get('testrail_project')
+ testrail_active_run = kwargs.get('testrail_only_run')
+ if testrail_active_run == '':
+ testrail_active_run = None
+ update_report_flag = kwargs.get('update_report_flag')
+
+ testrail_client = TestRail(email=testrail_user, key=testrail_user_key,
+ url=testrail_host)
+ testrail_client.set_project_id(testrail_client.project(
+ testrail_project).id)
+
+ # Get list runs with marked results
+ marked_runs = get_runs(testrail_client, testrail_m_plan,
+ testrail_active_run)
+
+ # Get list runs to update
+ runs = get_runs(testrail_client, testrail_plan, testrail_active_run)
+
+ # Get list (failed, prod_failed, test_failed,skipped..) tests with defects
+ marked_results = get_all_failed_results(testrail_client, marked_runs,
+ '2,3,4,5,6,7,8,9')
+
+ # Get list (failed) tests without defects to mark
+ failed_results = get_all_failed_results(testrail_client,
+ runs, '5') # 5-failed
+
+ # Generate list tests to update based on compare (defected
+ # results for tests with failed and not defected)
+ tests_to_update = mark_failed_results(testrail_client, marked_results,
+ failed_results, testrail_host)
+
+ if update_report_flag:
+ update_report(testrail_client, testrail_plan, tests_to_update)
+
+
COMMAND_MAP = {
- 'create-report': create_report
+ 'create-report': create_report,
+ 'mark-fails': mark_fails
}
diff --git a/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604-hwe.yaml
index d491551..ba69177 100644
--- a/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604-hwe.yaml
@@ -104,17 +104,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604.yaml
index eaa30dd..bdcd21d 100644
--- a/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604.yaml
@@ -100,17 +100,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604-hwe.yaml
index d491551..ba69177 100644
--- a/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604-hwe.yaml
@@ -104,17 +104,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604.yaml
index eaa30dd..bdcd21d 100644
--- a/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604.yaml
@@ -100,17 +100,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604-hwe.yaml
index e565677..44ae1f5 100644
--- a/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604-hwe.yaml
@@ -105,17 +105,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604.yaml
index 82b76ba..b39b37a 100644
--- a/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604.yaml
@@ -66,17 +66,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml
index 2ec1ffb..dd34ede 100644
--- a/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml
@@ -109,17 +109,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604.yaml
index 5aaf5a0..51fbc96 100644
--- a/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604.yaml
@@ -100,17 +100,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604-hwe.yaml
index df0e48a..4983612 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604-hwe.yaml
@@ -105,17 +105,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604.yaml
index 82b76ba..b39b37a 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604.yaml
@@ -66,17 +66,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604-hwe.yaml
index e565677..44ae1f5 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604-hwe.yaml
@@ -105,17 +105,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604.yaml
index 82b76ba..b39b37a 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604.yaml
@@ -66,17 +66,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604-hwe.yaml
index d491551..ba69177 100644
--- a/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604-hwe.yaml
@@ -104,17 +104,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604.yaml
index eaa30dd..bdcd21d 100644
--- a/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604.yaml
@@ -100,17 +100,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
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..4baed1d 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
@@ -372,9 +372,9 @@
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
- tenant_network_gateway: 192.168.0.220
+ tenant_network_gateway: 10.167.10.253
tenant_network_netmask: 255.255.255.0
- tenant_network_subnet: 192.168.0.0/24
+ tenant_network_subnet: 10.167.10.0/24
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'True'
openldap_domain: cookied-cicd-bm-ocata-contrail-maas.local
@@ -433,3 +433,6 @@
#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'
+ barbican_integration_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..5f626d2 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,6 @@
#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'
+ barbican_integration_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..3256d10 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,6 @@
#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'
+ barbican_integration_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..342b46c 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
@@ -372,9 +372,9 @@
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
- tenant_network_gateway: 192.168.0.220
+ tenant_network_gateway: 10.167.10.253
tenant_network_netmask: 255.255.255.0
- tenant_network_subnet: 192.168.0.0/24
+ tenant_network_subnet: 10.167.10.0/24
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'True'
openldap_domain: cookied-bm-4.0-contrail.local
@@ -433,3 +433,6 @@
#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'
+ barbican_integration_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..e4bc249 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
@@ -372,9 +372,9 @@
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
- tenant_network_gateway: 192.168.0.220
+ tenant_network_gateway: 10.167.10.253
tenant_network_netmask: 255.255.255.0
- tenant_network_subnet: 192.168.0.0/24
+ tenant_network_subnet: 10.167.10.0/24
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'True'
openldap_domain: cookied-cicd-bm-queens-contrail-maas.local
@@ -433,3 +433,6 @@
#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'
+ barbican_integration_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604.yaml
index 730382e..6451e34 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604.yaml
@@ -63,17 +63,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604.yaml
index 730382e..6451e34 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604.yaml
@@ -63,17 +63,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
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..3672e07 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,8 +177,6 @@
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'
diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604.yaml
index 730382e..6451e34 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604.yaml
@@ -63,17 +63,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
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..93554c6 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,43 @@
storage_vlan: '2405' # not implemented yet, placeholder
kqueen_custom_mail_enabled: 'False'
kqueen_enabled: 'False'
+ manila_enabled: 'False'
+ openscap_enabled: 'True'
+ 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: 'False'
+ 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..01366c3 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,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'
+ barbican_integration_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-dpdk/salt.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/salt.yaml
index ae2e235..64abc07 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/salt.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/salt.yaml
@@ -18,17 +18,6 @@
retry: {count: 1, delay: 10}
skip_fail: false
-- description: "Workaround to avoid reboot cmp nodes: apply patch to bring OVS interfaces UP (PROD-24343)"
- cmd: |
- set -ex
- git clone https://gerrit.mcp.mirantis.com/salt-formulas/linux /root/salt-formula-linux
- cd /root/salt-formula-linux
- git fetch https://gerrit.mcp.mirantis.com/salt-formulas/linux refs/changes/32/29432/11 && git checkout FETCH_HEAD
- cp -r /root/salt-formula-linux/linux/ /srv/salt/env/prd/
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 10}
- skip_fail: false
-
{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
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..2a6353e 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,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'
+ barbican_integration_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay--user-data1604.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay--user-data1604.yaml
@@ -63,17 +63,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
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..be70caa 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,7 @@
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'
+ barbican_integration_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-dvr-sl/salt.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/salt.yaml
index 12e013c..a38f2f3 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/salt.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/salt.yaml
@@ -9,17 +9,6 @@
{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-- description: "Workaround to avoid reboot cmp nodes: apply patch to bring OVS interfaces UP (PROD-24343)"
- cmd: |
- set -ex
- git clone https://gerrit.mcp.mirantis.com/salt-formulas/linux /root/salt-formula-linux
- cd /root/salt-formula-linux
- git fetch https://gerrit.mcp.mirantis.com/salt-formulas/linux refs/changes/32/29432/11 && git checkout FETCH_HEAD
- cp -r /root/salt-formula-linux/linux/ /srv/salt/env/prd/
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 10}
- skip_fail: false
-
{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
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..3e78a07 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,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'
+ barbican_integration_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-pike-ovs-sl/salt.yaml b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/salt.yaml
index 33440ad..4905e32 100644
--- a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/salt.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/salt.yaml
@@ -9,17 +9,6 @@
{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-- description: "Workaround to avoid reboot cmp nodes: apply patch to bring OVS interfaces UP (PROD-24343)"
- cmd: |
- set -ex
- git clone https://gerrit.mcp.mirantis.com/salt-formulas/linux /root/salt-formula-linux
- cd /root/salt-formula-linux
- git fetch https://gerrit.mcp.mirantis.com/salt-formulas/linux refs/changes/32/29432/11 && git checkout FETCH_HEAD
- cp -r /root/salt-formula-linux/linux/ /srv/salt/env/prd/
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 10}
- skip_fail: false
-
{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
diff --git a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/underlay--user-data1604-swp.yaml
index e4a0299..5a4fc79 100644
--- a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/underlay--user-data1604-swp.yaml
@@ -64,17 +64,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
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..aba63f2 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,7 @@
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'
+ barbican_integration_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay--user-data1604.yaml
index 1e12f74..f8b58f5 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay--user-data1604.yaml
@@ -53,18 +53,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
- root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/_context-cookiecutter-mcp-pike-dvr-ssl-barbican.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/_context-cookiecutter-mcp-pike-dvr-ssl-barbican.yaml
index 0ad8daf..baf1ba0 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/_context-cookiecutter-mcp-pike-dvr-ssl-barbican.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/_context-cookiecutter-mcp-pike-dvr-ssl-barbican.yaml
@@ -1,6 +1,7 @@
default_context:
barbican_backend: dogtag
barbican_enabled: 'True'
+ barbican_integration_enabled: 'False'
auditd_enabled: 'True'
bmk_enabled: 'False'
ceph_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-cookiecutter-mcp-pike-dvr-ssl.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-cookiecutter-mcp-pike-dvr-ssl.yaml
index 2fdfc6b..234a7f3 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-cookiecutter-mcp-pike-dvr-ssl.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-cookiecutter-mcp-pike-dvr-ssl.yaml
@@ -1,6 +1,7 @@
default_context:
barbican_backend: dogtag
barbican_enabled: 'False'
+ barbican_integration_enabled: 'False'
auditd_enabled: 'True'
bmk_enabled: 'False'
ceph_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-mcp-pike-ovs/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-pike-ovs/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-pike-ovs/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-ovs/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/cookiecutter-context-dvr-ceph.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
index 9f66d16..e402f2c 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
@@ -1,6 +1,7 @@
default_context:
barbican_backend: dogtag
barbican_enabled: 'False'
+ barbican_integration_enabled: 'False'
auditd_enabled: 'True'
backend_network_netmask: 255.255.255.0
backend_network_subnet: 10.167.4.0/24
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/_context-cookiecutter-mcp-queens-dvr-ssl-barbican.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/_context-cookiecutter-mcp-queens-dvr-ssl-barbican.yaml
index af06e9a..e01644c 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/_context-cookiecutter-mcp-queens-dvr-ssl-barbican.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/_context-cookiecutter-mcp-queens-dvr-ssl-barbican.yaml
@@ -1,6 +1,7 @@
default_context:
barbican_backend: dogtag
barbican_enabled: 'True'
+ barbican_integration_enabled: 'False'
auditd_enabled: 'True'
bmk_enabled: 'False'
ceph_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
index 2d36a8b..4246f94 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
@@ -1,6 +1,7 @@
default_context:
barbican_backend: dogtag
barbican_enabled: 'False'
+ barbican_integration_enabled: 'False'
auditd_enabled: 'True'
bmk_enabled: 'False'
ceph_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
index 85f91da..0af6a85 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
@@ -1,6 +1,7 @@
default_context:
barbican_backend: dogtag
barbican_enabled: 'False'
+ barbican_integration_enabled: 'False'
auditd_enabled: 'True'
bmk_enabled: 'False'
ceph_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml b/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml
index f43c412..f4854e9 100644
--- a/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml
@@ -1,6 +1,7 @@
default_context:
barbican_backend: dogtag
barbican_enabled: 'False'
+ barbican_integration_enabled: 'False'
auditd_enabled: 'True'
bmk_enabled: 'False'
ceph_enabled: 'False'
diff --git a/tcp_tests/templates/cookied-mcp-queens-ovs/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-queens-ovs/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-ovs/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-ovs/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml b/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml
index 67390f8..ec9df27 100644
--- a/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml
@@ -57,17 +57,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/k8s-ha-contrail/underlay--user-data1604.yaml b/tcp_tests/templates/k8s-ha-contrail/underlay--user-data1604.yaml
index 73e3e1f..d23efd2 100644
--- a/tcp_tests/templates/k8s-ha-contrail/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/k8s-ha-contrail/underlay--user-data1604.yaml
@@ -80,17 +80,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay--user-data1604.yaml b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay--user-data1604.yaml
index 1ef9a97..c5fc670 100644
--- a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay--user-data1604.yaml
@@ -77,17 +77,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart:
diff --git a/tcp_tests/templates/virtual-offline-ssl/underlay--user-data1604.yaml b/tcp_tests/templates/virtual-offline-ssl/underlay--user-data1604.yaml
index 1ef9a97..c5fc670 100644
--- a/tcp_tests/templates/virtual-offline-ssl/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/virtual-offline-ssl/underlay--user-data1604.yaml
@@ -77,17 +77,17 @@
- path: /usr/share/growlvm/image-layout.yml
content: |
root:
- size: '50%VG'
+ size: '30%VG'
home:
- size: '100M'
+ size: '1G'
var_log:
- size: '15%VG'
+ size: '11%VG'
var_log_audit:
- size: '500M'
+ size: '5G'
var_tmp:
- size: '500M'
+ size: '11%VG'
tmp:
- size: '500M'
+ size: '5G'
owner: root:root
growpart: