Merge "Add mirror 2way for oc"
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 7a441b6..2a32dc6 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -105,10 +105,6 @@
type: string
default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
- # Salt master setup extra formulas
- EXTRA_FORMULAS:
- type: string
- default: "{{extra_formulas}}"
ASK_ON_ERROR:
type: boolean
default: 'false'
diff --git a/jenkins/client/job/deploy/lab/mk/physical.yml b/jenkins/client/job/deploy/lab/mk/physical.yml
index b04ba23..8e6d498 100644
--- a/jenkins/client/job/deploy/lab/mk/physical.yml
+++ b/jenkins/client/job/deploy/lab/mk/physical.yml
@@ -8,22 +8,18 @@
stack_type: physical
test: openstack
timer: ""
- extra_formulas: ""
- lab: mcp10_opencontrail_nfv
install: core,kvm,openstack,nfv
stack_type: physical
test: openstack
timer: ""
- extra_formulas: ""
- lab: mcp10_dvr
install: core,kvm,openstack,dvr
stack_type: physical
test: openstack
timer: ""
- extra_formulas: ""
- lab: mcp10_non_dvr
install: core,kvm,openstack
stack_type: physical
test: openstack
timer: ""
- extra_formulas: ""
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index e491da4..e4b573d 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -5,14 +5,19 @@
job_template:
test_salt_model:
name: test-salt-model-{{name}}
- param:
- name:
- - mcp-baremetal-lab
- - mcp-virtual-lab
- - mk-ci
- - qa
- - stacklight
- - training
+ jobs:
+ - name: mcp-baremetal-lab
+ extra_formulas: ""
+ - name: mcp-virtual-lab
+ extra_formulas: "prometheus"
+ - name: mk-ci
+ extra_formulas: ""
+ - name: qa
+ extra_formulas: ""
+ - name: stacklight
+ extra_formulas: ""
+ - name: training
+ extra_formulas: ""
template:
type: workflow-scm
scm:
@@ -53,6 +58,10 @@
PARALLEL_NODE_GROUP_SIZE:
type: string
default: "3"
+ # Salt master setup extra formulas
+ EXTRA_FORMULAS:
+ type: string
+ default: "{{extra_formulas}}"
test_system_reclass:
name: test-salt-model-{{name}}
jobs:
diff --git a/opencontrail/control/analytics.yml b/opencontrail/control/analytics.yml
index 8cbd166..8065742 100644
--- a/opencontrail/control/analytics.yml
+++ b/opencontrail/control/analytics.yml
@@ -14,6 +14,9 @@
python-kafka:
version: 1.0.1-0contrail1
hold: true
+ kernel:
+ modules:
+ - nf_conntrack_ipv4
opencontrail:
common:
identity:
diff --git a/opencontrail/control/cluster.yml b/opencontrail/control/cluster.yml
index 7e30779..a4126d6 100644
--- a/opencontrail/control/cluster.yml
+++ b/opencontrail/control/cluster.yml
@@ -13,6 +13,9 @@
version: 0.9.0-0contrail0
python-kafka:
version: 1.0.1-0contrail1
+ kernel:
+ modules:
+ - nf_conntrack_ipv4
opencontrail:
web:
database:
diff --git a/opencontrail/control/control.yml b/opencontrail/control/control.yml
index 9c1d905..fdc4f7d 100644
--- a/opencontrail/control/control.yml
+++ b/opencontrail/control/control.yml
@@ -38,3 +38,8 @@
port: 9042
network:
host: ${_param:cluster_vip_address}
+ linux:
+ system:
+ kernel:
+ modules:
+ - nf_conntrack_ipv4
diff --git a/opencontrail/control/single.yml b/opencontrail/control/single.yml
index efdc267..064418e 100644
--- a/opencontrail/control/single.yml
+++ b/opencontrail/control/single.yml
@@ -12,6 +12,9 @@
version: 1.0.1-0contrail1
contrail-api-cli:
version: latest
+ kernel:
+ modules:
+ - nf_conntrack_ipv4
haproxy:
proxy:
listen: