Merge "Add missing repository in OC4 lab"
diff --git a/classes/cluster/aaa-ha-freeipa/infra/init.yml b/classes/cluster/aaa-ha-freeipa/infra/init.yml
index fdf066a..12e77b0 100644
--- a/classes/cluster/aaa-ha-freeipa/infra/init.yml
+++ b/classes/cluster/aaa-ha-freeipa/infra/init.yml
@@ -6,6 +6,8 @@
- system.openssh.server.team.all
- system.rsyslog.client.single
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
# infra service addresses
infra_config_hostname: cfg01
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml b/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
index c60131d..0c488ba 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
@@ -5,6 +5,8 @@
- system.linux.system.repo.ubuntu
- system.openssh.server.team.all
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
# infra service addresses
infra_config_hostname: cfg01
diff --git a/classes/cluster/model-manager/infra/init.yml b/classes/cluster/model-manager/infra/init.yml
index 2eb79d1..1df2511 100644
--- a/classes/cluster/model-manager/infra/init.yml
+++ b/classes/cluster/model-manager/infra/init.yml
@@ -1,4 +1,6 @@
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: model-manager.local
cluster_name: model-manager
diff --git a/classes/cluster/os-aio-contrail/infra/init.yml b/classes/cluster/os-aio-contrail/infra/init.yml
index 1050967..3491660 100755
--- a/classes/cluster/os-aio-contrail/infra/init.yml
+++ b/classes/cluster/os-aio-contrail/infra/init.yml
@@ -1,4 +1,6 @@
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: os-aio-contrail.local
cluster_name: os-aio-contrail
diff --git a/classes/cluster/os-aio-ovs/infra/init.yml b/classes/cluster/os-aio-ovs/infra/init.yml
index 32d7bcd..df691ed 100644
--- a/classes/cluster/os-aio-ovs/infra/init.yml
+++ b/classes/cluster/os-aio-ovs/infra/init.yml
@@ -1,4 +1,6 @@
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: os-aio-ovs.local
cluster_name: os-aio-ovs
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/init.yml b/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
index 750dbc0..45a9304 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
@@ -1,9 +1,9 @@
parameters:
_param:
opencontrail_analytics_address: ${_param:opencontrail_control_address}
- opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
- opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
- opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
+ opencontrail_analytics_node01_address: ${_param:opencontrail_control_node01_address}
+ opencontrail_analytics_node02_address: ${_param:opencontrail_control_node02_address}
+ opencontrail_analytics_node03_address: ${_param:opencontrail_control_node03_address}
opencontrail_analytics_node01_hostname: ntw01
opencontrail_analytics_node02_hostname: ntw02
opencontrail_analytics_node03_hostname: ntw03
diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index 2b04e1f..c3e9ea2 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -1,5 +1,6 @@
classes:
- service.git.client
+- service.opencontrail.test.single
- system.linux.system.single
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.openstack
diff --git a/classes/cluster/os-ha-contrail/opencontrail/control.yml b/classes/cluster/os-ha-contrail/opencontrail/control.yml
index fc3b493..ff21331 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/control.yml
@@ -76,3 +76,5 @@
route_target: 10000
external: True
rpf: 'disable'
+ domain: 'default-domain'
+ project: 'default-project'
diff --git a/classes/cluster/sl-k8s-calico/infra/init.yml b/classes/cluster/sl-k8s-calico/infra/init.yml
index d6c546e..b585338 100644
--- a/classes/cluster/sl-k8s-calico/infra/init.yml
+++ b/classes/cluster/sl-k8s-calico/infra/init.yml
@@ -6,6 +6,8 @@
- system.openssh.server.team.all
- system.rsyslog.client.single
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
# infra service addresses
infra_config_hostname: cfg01
diff --git a/classes/cluster/sl-k8s-contrail/infra/init.yml b/classes/cluster/sl-k8s-contrail/infra/init.yml
index 6a22605..e42e891 100644
--- a/classes/cluster/sl-k8s-contrail/infra/init.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/init.yml
@@ -4,6 +4,8 @@
- system.linux.system.repo.ubuntu
- system.rsyslog.client.single
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
# infra service addresses
infra_config_hostname: cfg01
diff --git a/classes/cluster/sl-os-contrail/infra/init.yml b/classes/cluster/sl-os-contrail/infra/init.yml
index a812065..5c878d4 100755
--- a/classes/cluster/sl-os-contrail/infra/init.yml
+++ b/classes/cluster/sl-os-contrail/infra/init.yml
@@ -1,4 +1,6 @@
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: sl-os-contrail.local
cluster_name: sl-os-contrail
diff --git a/classes/cluster/sl-os-ovs/infra/init.yml b/classes/cluster/sl-os-ovs/infra/init.yml
index 174d408..3722558 100644
--- a/classes/cluster/sl-os-ovs/infra/init.yml
+++ b/classes/cluster/sl-os-ovs/infra/init.yml
@@ -1,4 +1,6 @@
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: sl-os-ovs.local
cluster_name: sl-os-ovs
diff --git a/classes/cluster/virtual-mcp05-dvr/init.yml b/classes/cluster/virtual-mcp05-dvr/init.yml
index 1fdd09c..f20c696 100644
--- a/classes/cluster/virtual-mcp05-dvr/init.yml
+++ b/classes/cluster/virtual-mcp05-dvr/init.yml
@@ -10,6 +10,8 @@
- cluster.virtual-mcp05-dvr.stacklight
- cluster.virtual-mcp05-dvr.stacklight.client
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: virtual-mcp05-dvr.local
cluster_name: virtual-mcp05-dvr
diff --git a/classes/cluster/virtual-mcp05-ovs/init.yml b/classes/cluster/virtual-mcp05-ovs/init.yml
index 0249838..bdc998e 100644
--- a/classes/cluster/virtual-mcp05-ovs/init.yml
+++ b/classes/cluster/virtual-mcp05-ovs/init.yml
@@ -10,6 +10,8 @@
- system.openssh.server.team.mcp_qa
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: virtual-mcp05-ovs.local
cluster_name: virtual-mcp05-ovs
@@ -38,4 +40,4 @@
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
- stacklight_log_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
+ stacklight_log_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp10-contrail/init.yml b/classes/cluster/virtual-mcp10-contrail/init.yml
index 236da7a..0cbaaf5 100755
--- a/classes/cluster/virtual-mcp10-contrail/init.yml
+++ b/classes/cluster/virtual-mcp10-contrail/init.yml
@@ -10,6 +10,8 @@
- cluster.virtual-mcp10-contrail.stacklight
- cluster.virtual-mcp10-contrail.stacklight.client
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: virtual-mcp10-contrail.local
cluster_name: virtual-mcp10-contrail
@@ -56,4 +58,4 @@
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
- stacklight_log_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
+ stacklight_log_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp10-dvr/init.yml b/classes/cluster/virtual-mcp10-dvr/init.yml
index 3e8ebc8..bf8c403 100644
--- a/classes/cluster/virtual-mcp10-dvr/init.yml
+++ b/classes/cluster/virtual-mcp10-dvr/init.yml
@@ -10,6 +10,8 @@
- cluster.virtual-mcp10-dvr.stacklight
- cluster.virtual-mcp10-dvr.stacklight.client
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: virtual-mcp10-dvr.local
cluster_name: virtual-mcp10-dvr
@@ -40,4 +42,4 @@
stacklight_monitor_node02_address: 172.16.10.108
stacklight_monitor_node03_address: 172.16.10.109
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
- stacklight_log_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
+ stacklight_log_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp10-ovs/init.yml b/classes/cluster/virtual-mcp10-ovs/init.yml
index 518a42b..65ae889 100644
--- a/classes/cluster/virtual-mcp10-ovs/init.yml
+++ b/classes/cluster/virtual-mcp10-ovs/init.yml
@@ -10,6 +10,8 @@
- cluster.virtual-mcp10-ovs.stacklight.client
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: virtual-mcp10-ovs.local
cluster_name: virtual-mcp10-ovs
@@ -37,4 +39,4 @@
stacklight_log_address: ${_param:stacklight_monitor_address}
openstack_gateway_address: 172.16.10.110
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
- stacklight_telemetry_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
+ stacklight_telemetry_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/init.yml b/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
index fc97787..d33187c 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
@@ -11,6 +11,8 @@
- cluster.virtual-mcp11-contrail-nfv.stacklight
- cluster.virtual-mcp11-contrail-nfv.stacklight.client
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
cluster_domain: virtual-mcp11-contrail-nfv.local
cluster_name: virtual-mcp11-contrail-nfv
@@ -83,4 +85,4 @@
address: ${_param:opencontrail_control_node03_address}
names:
- ntw03
- - ntw03.${_param:cluster_domain}
\ No newline at end of file
+ - ntw03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
index 9eec8d0..4f1b9d9 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
@@ -9,6 +9,8 @@
- system.prometheus.collector
- service.grafana.collector
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
# infra service addresses
infra_config_hostname: cfg01
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/.env b/classes/cluster/virtual-mcp11-k8s-calico-minimal/.env
new file mode 100644
index 0000000..ceab58c
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="etcd"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
index 017d4d6..aad38e6 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
@@ -6,6 +6,8 @@
- system.openssh.server.team.all
- system.rsyslog.client.single
parameters:
+ _jenkins:
+ tests_enabled: false
_param:
# infra service addresses
infra_config_hostname: cfg01
diff --git a/classes/system b/classes/system
index 89681a6..9d2e769 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 89681a669330a40caecbae05ee8ba4504d0945c7
+Subproject commit 9d2e769909eb21b3de8cdbe7d84ad2ff59bb8660