Merge "Add 'release/2018.11.0' sync job"
diff --git a/jenkins/client/job/security/openscap.yml b/jenkins/client/job/security/openscap.yml
index 7bedf61..b98e497 100644
--- a/jenkins/client/job/security/openscap.yml
+++ b/jenkins/client/job/security/openscap.yml
@@ -21,6 +21,12 @@
credentials: "gerrit"
script: test-openscap-pipeline.groovy
param:
+ OPENSCAP_TEST_TYPE:
+ type: choice
+ description: "Type of tests to run"
+ choices:
+ - xccdf
+ - oval
DASHBOARD_API_URL:
type: string
default: ""
diff --git a/opencontrail/compute/cluster.yml b/opencontrail/compute/cluster.yml
index 5e92709..7cdcdf6 100644
--- a/opencontrail/compute/cluster.yml
+++ b/opencontrail/compute/cluster.yml
@@ -33,6 +33,3 @@
mask: ${_param:opencontrail_compute_iface_mask}
dns: ${_param:opencontrail_compute_dns}
mtu: 9000
- nova:
- compute:
- networking: contrail
diff --git a/opencontrail/compute/cluster4_0.yml b/opencontrail/compute/cluster4_0.yml
index 8c16c70..425f897 100644
--- a/opencontrail/compute/cluster4_0.yml
+++ b/opencontrail/compute/cluster4_0.yml
@@ -48,6 +48,3 @@
mask: ${_param:opencontrail_compute_iface_mask}
dns: ${_param:opencontrail_compute_dns}
mtu: 9000
- nova:
- compute:
- networking: contrail
diff --git a/opencontrail/compute/single.yml b/opencontrail/compute/single.yml
index d3caa45..65426c8 100644
--- a/opencontrail/compute/single.yml
+++ b/opencontrail/compute/single.yml
@@ -30,7 +30,6 @@
mtu: 9000
nova:
compute:
- networking: contrail
network:
engine: keystone
host: ${_param:control_address}
diff --git a/opencontrail/compute/single4_0.yml b/opencontrail/compute/single4_0.yml
index bd77c05..b48d1d0 100644
--- a/opencontrail/compute/single4_0.yml
+++ b/opencontrail/compute/single4_0.yml
@@ -38,7 +38,4 @@
mask: ${_param:opencontrail_compute_iface_mask}
dns: ${_param:opencontrail_compute_dns}
mtu: 9000
- nova:
- compute:
- networking: contrail