summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ci/bundles.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml1
-rw-r--r--ci/onos/juju-deployer/ovs-onos-ha.yaml1
-rw-r--r--ci/onos/juju-deployer/ovs-onos-nonha.yaml1
-rw-r--r--ci/onos/juju-deployer/ovs-onos-tip.yaml1
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml1
11 files changed, 0 insertions, 11 deletions
diff --git a/ci/bundles.yaml b/ci/bundles.yaml
index 81449d61..6199299d 100644
--- a/ci/bundles.yaml
+++ b/ci/bundles.yaml
@@ -123,7 +123,6 @@ openstack-phase2:
options:
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
to:
- "lxc:nodes-api=0"
neutron-api:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index cdcd0ffb..db599bcf 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -146,7 +146,6 @@ openstack-phase2:
num_units: 3
options:
network-manager: Neutron
- quantum-security-groups: 'yes'
service-guard: true
vip: 10.4.1.16
to:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 3712340c..e86990aa 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -127,7 +127,6 @@ openstack-phase2:
num_units: 1
options:
network-manager: Neutron
- quantum-security-groups: 'yes'
to:
- "lxc:nodes-api=0"
nova-compute:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index ef368581..8a16129c 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -128,7 +128,6 @@ openstack-phase2:
openstack-origin-git: include-file://nova-master.yaml
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
to:
- "lxc:nodes-api=0"
neutron-api:
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index d806805a..d55bd674 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -194,7 +194,6 @@ openstack-phase2:
options:
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
service-guard: true
neutron-external-network: ext_net
vip: 10.4.1.16
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 30deb14e..26acec9f 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -128,7 +128,6 @@ openstack-phase2:
options:
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
to:
- "lxc:nodes-api=0"
neutron-api:
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 37cb6c1c..1ef94467 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -127,7 +127,6 @@ openstack-phase2:
openstack-origin-git: include-file://nova-master.yaml
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
to:
- "lxc:nodes-api=0"
neutron-api:
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 8ad3b0e4..a4cfa366 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -182,7 +182,6 @@ openstack-phase2:
options:
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
service-guard: true
vip: 10.4.1.16
to:
diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index e32b8101..be7819c0 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -126,7 +126,6 @@ openstack-phase2:
options:
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
to:
- "lxc:nodes-api=0"
neutron-api:
diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index 91832ac5..13786b91 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -126,7 +126,6 @@ openstack-phase2:
openstack-origin-git: include-file://nova-master.yaml
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
to:
- "lxc:nodes-api=0"
neutron-api:
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index e09a1d7f..e740f58f 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -197,7 +197,6 @@ openstack-phase2:
options:
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
service-guard: true
neutron-external-network: ext_net
vip: 10.4.1.16