summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-10-08 23:52:04 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-10-08 23:52:26 -0500
commit24550c173f0ef3376f9c358260f1f6f4c3382445 (patch)
treed62bbe5f3935ba9a35b6a77d76c5a1bdf61ee08a /ci/config_tpl
parent1c013c1ea57b207fbe4b0f9308d5d9fd5cfd0141 (diff)
correct the bundle.
Change-Id: I4f150cea46748edf8bf5d740541ddd10bffce6bb Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl')
-rw-r--r--ci/config_tpl/bundle_tpl/bundle.yaml3
-rw-r--r--ci/config_tpl/bundle_tpl/subordinate.yaml1
2 files changed, 4 insertions, 0 deletions
diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml
index 9e171b8f..c9700842 100644
--- a/ci/config_tpl/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/bundle_tpl/bundle.yaml
@@ -61,6 +61,7 @@
{% if os.ha.mode == 'ha' %}
{% include 'haclusters.yaml' %}
{% endif %}
+
{% include 'subordinate.yaml' %}
{% if os.hyperconverged %}
@@ -71,7 +72,9 @@
- [ 'ntp:juju-info', 'nodes:juju-info' ]
- [ 'ntp:juju-info', 'nodes-compute:juju-info' ]
{% endif %}
+
{% if os.ha.mode == 'ha' %}
{% include 'harelations.yaml' %}
{% endif %}
+
{% include 'relations.yaml' %}
diff --git a/ci/config_tpl/bundle_tpl/subordinate.yaml b/ci/config_tpl/bundle_tpl/subordinate.yaml
index 4107d80b..1033866e 100644
--- a/ci/config_tpl/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/bundle_tpl/subordinate.yaml
@@ -1,3 +1,4 @@
+
ceilometer-agent:
charm: local:{{ ubuntu.release }}/ceilometer-agent
options: