updated the source for ceph deployment.

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

diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml
index 9e171b8..6171081 100644 (file)
--- a/ci/config_tpl/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/bundle_tpl/bundle.yaml
@@ -1,5 +1,13 @@
 # vim: set ts=2 et:
+{{ ubuntu.release }}-{{ os.release }}-nodes:
+  inherits: openstack-phase1
+  overrides:
+{% include 'phase2-overrides.yaml' %}
+
 {{ ubuntu.release }}-{{ os.release }}:
+  inherits: openstack-phase2
+
+openstack-phase1:
   services:
 {% if os.hyperconverged %}
     nodes:
@@ -61,7 +69,7 @@
 {% if os.ha.mode == 'ha' %}
 {% include 'haclusters.yaml' %}
 {% endif %}
-{% include 'subordinate.yaml' %}
+
 
 {% if os.hyperconverged %}
   relations:
@@ -71,7 +79,14 @@
     - [ 'ntp:juju-info', 'nodes:juju-info' ]
     - [ 'ntp:juju-info', 'nodes-compute:juju-info' ]
 {% endif %}
+
 {% if os.ha.mode == 'ha' %}
 {% include 'harelations.yaml' %}
 {% endif %}
+
+openstack-phase2:
+  inherits: openstack-phase1
+  relations:
 {% include 'relations.yaml' %}
+  services:
+{% include 'subordinate.yaml' %}