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 c970084..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:
@@ -62,7 +70,6 @@
 {% include 'haclusters.yaml' %}
 {% endif %}
 
-{% include 'subordinate.yaml' %}
 
 {% if os.hyperconverged %}
   relations:
@@ -77,4 +84,9 @@
 {% include 'harelations.yaml' %}
 {% endif %}
 
+openstack-phase2:
+  inherits: openstack-phase1
+  relations:
 {% include 'relations.yaml' %}
+  services:
+{% include 'subordinate.yaml' %}