modified as per latest commits from the cloud controllerc charm as

no legacy quantum plugin available.

Change-Id: Iaefdbab9f7e659fb4ec68439d59fcd01d2548145
(cherry picked from commit 37b93a7392ab8ca3e0a20f8194576b671ecb1904)

diff --git a/ci/bundles.yaml b/ci/bundles.yaml
index 81449d6..6199299 100644 (file)
--- 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 cdcd0ff..db599bc 100644 (file)
--- 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 3712340..e86990a 100644 (file)
--- 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 ef36858..8a16129 100644 (file)
--- 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 f1d2ed1..0b3b93f 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -180,7 +180,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 30deb14..26acec9 100644 (file)
--- 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 37cb6c1..1ef9446 100644 (file)
--- 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 9c80226..e829a75 100644 (file)
--- 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
         neutron-external-network: ext_net
         vip: 10.4.1.16

diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index e00ba4b..c3d78bf 100644 (file)
--- 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 dd00f2d..b6e1562 100644 (file)
--- 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 e09a1d7..e740f58 100644 (file)
--- 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