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

[joid.git] / ci / bundle_tpl / bundle.yaml

diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml
index 4aae4fb..713a693 100644 (file)
--- 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:
@@ -18,6 +15,11 @@ openstack-phase1:
 {% endif %}
     ntp:
       charm: "local:{{ ubuntu.release }}/ntp"
+{% if os.network.controller == 'ocl' %}
+      options:
+        source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
+        auto_peers: false
+{% endif %}
 {% include 'mysql.yaml' %}
 {% include 'ceilometer.yaml' %}
 {% include 'ceph.yaml' %}
@@ -34,24 +36,21 @@ openstack-phase1:
 {% include 'neutron-api.yaml' %}
 {% include 'neutron-gateway.yaml' %}
 {% if os.network.controller == 'odl' %}
-    {% include 'odl.yaml' %}
+{% include 'odl.yaml' %}
 {% elif os.network.controller == 'onos' %}
-    {% include 'onos.yaml' %}
+{% include 'onos.yaml' %}
+{% elif os.network.controller == 'ocl' %}
+{% include 'oclphase1.yaml' %}
 {% endif %}
 {% if os.ha.mode == 'ha' %}
-    {% include 'haclusters.yaml' %}
+{% include 'haclusters.yaml' %}
 {% endif %}
+{% include 'subordinate.yaml' %}
 
   relations:
-    - - "ntp:juju-info"
-      - "nodes:juju-info"
+    - [ 'ntp:juju-info', 'nodes:juju-info' ]
 {% if os.ha.mode == 'ha' %}
-    {% include 'harelations.yaml' %}
+{% include 'harelations.yaml' %}
 {% endif %}
-
-openstack-phase2:
-  inherits: openstack-phase1
-  relations:
 {% include 'relations.yaml' %}
-  services:
-{% include 'subordinate.yaml' %}
+