tried to modify into single bundle. That is correct step to move

towards JUJU 2.0

Change-Id: I58e24aac2b5c23982a888bdc69830f95a9f79122
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

4 files changed, 7 insertions, 12 deletions

diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml
index 62047fba..713a6931 100644
--- a/ci/bundle_tpl/bundle.yaml
+++ b/ci/bundle_tpl/bundle.yaml
@@ -1,12 +1,9 @@
 # vim: set ts=2 et:
-{{ ubuntu.release }}-{{ os.release }}-nodes:
+{{ ubuntu.release }}-{{ os.release }}:
   inherits: openstack-phase1
   overrides:
 {% include 'phase2-overrides.yaml' %}
 
-{{ ubuntu.release }}-{{ os.release }}:
-  inherits: openstack-phase2
-
 openstack-phase1:
   services:
     nodes:
@@ -48,16 +45,12 @@ openstack-phase1:
 {% if os.ha.mode == 'ha' %}
 {% include 'haclusters.yaml' %}
 {% endif %}
+{% include 'subordinate.yaml' %}
 
   relations:
     - [ 'ntp:juju-info', 'nodes:juju-info' ]
 {% if os.ha.mode == 'ha' %}
 {% include 'harelations.yaml' %}
 {% endif %}
-
-openstack-phase2:
-  inherits: openstack-phase1
-  relations:
 {% include 'relations.yaml' %}
-  services:
-{% include 'subordinate.yaml' %}
+
diff --git a/ci/bundle_tpl/neutron-api.yaml b/ci/bundle_tpl/neutron-api.yaml
index 86c6fedf..88990cb3 100644
--- a/ci/bundle_tpl/neutron-api.yaml
+++ b/ci/bundle_tpl/neutron-api.yaml
@@ -4,7 +4,8 @@
       options:
         neutron-security-groups: true
 {% if os.network.controller == 'nosdn' %}
-        overlay-network-type: vxlan
+        flat-network-providers: "*"
+        #overlay-network-type: gre vxlan
 {% elif os.network.controller == 'odl' %}
         manage-neutron-plugin-legacy-mode: False
 {% elif os.network.controller == 'onos' %}
diff --git a/ci/bundle_tpl/neutron-ovs.yaml b/ci/bundle_tpl/neutron-ovs.yaml
index 20bf1d9b..446c6f25 100644
--- a/ci/bundle_tpl/neutron-ovs.yaml
+++ b/ci/bundle_tpl/neutron-ovs.yaml
@@ -1,7 +1,7 @@
     neutron-openvswitch:
       charm: local:{{ ubuntu.release }}/neutron-openvswitch
-      options:
 {% if os.network.dpdk %}
+      options:
         enable-dpdk: true
         #dpdk-driver: uio_pci_generic
         #data-port: ""
diff --git a/ci/bundle_tpl/nova-cloud-controller.yaml b/ci/bundle_tpl/nova-cloud-controller.yaml
index 47421145..20e9bf4f 100644
--- a/ci/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/bundle_tpl/nova-cloud-controller.yaml
@@ -4,6 +4,7 @@
       options:
         console-access-protocol: novnc
         neutron-external-network: ext-net
+        service-guard: true
 {% if opnfv.domain is defined %}
         console-proxy-ip: {{ opnfv.domain }}
 {% endif %}