summaryrefslogtreecommitdiffstats
path: root/ci/nosdn
diff options
context:
space:
mode:
Diffstat (limited to 'ci/nosdn')
-rwxr-xr-xci/nosdn/fetch-charms.sh13
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml12
2 files changed, 23 insertions, 2 deletions
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index d715bd80..0a659af0 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -1,8 +1,14 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
distro=$1
mkdir -p $distro
+function build {
+ sudo apt-get install charm-tools
+ (cd $distro/charm-congress; charm build -s $distro -obuild src)
+ mv $distro/charm-congress/build/$distro/congress $distro
+}
+
# openstack
bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
@@ -16,7 +22,8 @@ git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-rados
git clone https://github.com/openstack/charm-cinder.git $distro/cinder
git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
git clone https://github.com/openstack/charm-glance.git $distro/glance
-git clone https://github.com/openstack/charm-keystone.git $distro/keystone
+#git clone https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b bug/congress-fix https://github.com/gnuoy/charm-keystone.git $distro/keystone
git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
@@ -27,3 +34,5 @@ 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/openstack/charm-lxd.git xenial/lxd
+git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
+build
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 3601d2c5..db7474e8 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -127,6 +127,12 @@ openstack-phase2:
- rabbitmq-server:amqp
#- - nova-compute:lxd
#- lxd:lxd
+ - - congress:shared-db
+ - mysql:shared-db
+ - - congress:identity-service
+ - keystone:identity-service
+ - - congress:amqp
+ - rabbitmq-server:amqp
services:
ceilometer:
charm: "local:trusty/ceilometer"
@@ -257,3 +263,9 @@ openstack-phase2:
charm: "local:trusty/heat"
to:
- "lxc:nodes=0"
+ congress:
+ charm: local:trusty/congress
+ options:
+ source-branch: stable/liberty
+ to:
+ - "lxc:nodes=1"