diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-07-01 01:41:08 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-07-01 01:43:35 -0500 |
| commit | 331fa0a67b27023c6c00358a418a7f7b43cc6da3 (patch) | |
| tree | 4cb5be7af04c35c81fa8787b64b13516c1c19e7a | |
| parent | 8deafd3523d665540ffd27398a0274725b33c3ad (diff) | |
added congress charm as well.
Change-Id: Ia40210fd2e0a2935df5dedd4fd24493abf567cf1
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
| -rw-r--r-- | ci/bundle_tpl/bundle.yaml | 1 | ||||
| -rw-r--r-- | ci/bundle_tpl/congress.yaml | 9 | ||||
| -rw-r--r-- | ci/bundle_tpl/subordinate.yaml | 2 | ||||
| -rwxr-xr-x | ci/odl/fetch-charms.sh | 1 |
4 files changed, 12 insertions, 1 deletions
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 %} diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index 2483fa8c..dc1c7fe3 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -33,6 +33,7 @@ git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/ope git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server git clone https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress +git clone https://github.com/openstack/charm-lxd.git xenial/lxd build #controller specific charm |