From 331fa0a67b27023c6c00358a418a7f7b43cc6da3 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 1 Jul 2016 01:41:08 -0500 Subject: added congress charm as well. Change-Id: Ia40210fd2e0a2935df5dedd4fd24493abf567cf1 Signed-off-by: Narinder Gupta --- ci/bundle_tpl/bundle.yaml | 1 + ci/bundle_tpl/congress.yaml | 9 +++++++++ ci/bundle_tpl/subordinate.yaml | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 ci/bundle_tpl/congress.yaml (limited to 'ci/bundle_tpl') diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml index 9343e5be..19bf115c 100644 --- a/ci/bundle_tpl/bundle.yaml +++ b/ci/bundle_tpl/bundle.yaml @@ -24,6 +24,7 @@ openstack-phase1: {% include 'cinder.yaml' %} {% include 'glance.yaml' %} {% include 'opnfv-promise.yaml' %} +{% include 'congress.yaml' %} {% include 'keystone.yaml' %} {% include 'nova-cloud-controller.yaml' %} {% include 'nova-compute.yaml' %} diff --git a/ci/bundle_tpl/congress.yaml b/ci/bundle_tpl/congress.yaml new file mode 100644 index 00000000..3d05295e --- /dev/null +++ b/ci/bundle_tpl/congress.yaml @@ -0,0 +1,9 @@ + congress: + charm: "local:{{ ubuntu.release }}/congress" +{% if ubuntu.release == 'trusty' %} + options: + source-branch: "stable/{{ os.release }}" +{% endif %} + to: + - "lxc:nodes=0" +{# Empty block to avoid bad block trim #} diff --git a/ci/bundle_tpl/subordinate.yaml b/ci/bundle_tpl/subordinate.yaml index 1391ad85..c84cdd72 100644 --- a/ci/bundle_tpl/subordinate.yaml +++ b/ci/bundle_tpl/subordinate.yaml @@ -22,7 +22,7 @@ overlay-network-type: 'vxlan' security-groups: True {% endif %} -{% if os.lxd is defined %} +{% if os.lxd %} lxd: charm: local:{{ ubuntu.release }}/lxd {% endif %} -- cgit 1.2.3-korg