From 24550c173f0ef3376f9c358260f1f6f4c3382445 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Sat, 8 Oct 2016 23:52:04 -0500 Subject: [PATCH] correct the bundle. Change-Id: I4f150cea46748edf8bf5d740541ddd10bffce6bb Signed-off-by: Narinder Gupta --- ci/config_tpl/bundle_tpl/bundle.yaml | 3 +++ ci/config_tpl/bundle_tpl/subordinate.yaml | 1 + 2 files changed, 4 insertions(+) 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: -- 2.16.6