summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/bundle_tpl/bundle.yaml1
-rw-r--r--ci/bundle_tpl/congress.yaml9
-rw-r--r--ci/bundle_tpl/subordinate.yaml2
-rwxr-xr-xci/odl/fetch-charms.sh1
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