diff options
Diffstat (limited to 'ci/opencontrail')
| -rwxr-xr-x | ci/opencontrail/fetch-charms.sh | 10 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml | 31 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml | 12 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml | 12 |
4 files changed, 54 insertions, 11 deletions
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index c64eb4a5..c46fee21 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -1,9 +1,15 @@ -#!/bin/sh -ex +#!/bin/bash -ex distro=$1 mkdir precise mkdir -p $distro +function build { + sudo apt-get install charm-tools -y + (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 @@ -28,6 +34,8 @@ git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compu git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard 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 +build # Controller specific charm bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml index 99936e76..65c90463 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml @@ -40,7 +40,7 @@ openstack-phase1: openstack-phase2: inherits: openstack-phase1 services: - percona-cluster: + mysql: branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 3 options: @@ -227,7 +227,13 @@ openstack-phase2: branch: lp:~narindergupta/charms/trusty/promise/trunk num_units: 1 to: - - "lxc:nodes-api=2" + - "lxc:nodes-api=0" + congress: + charm: local:trusty/congress + options: + source-branch: stable/liberty + to: + - "lxc:nodes-api=0" relations: - [ "glance:ha", "hacluster-glance:ha" ] - [ "keystone:ha", "hacluster-keystone:ha" ] @@ -235,19 +241,19 @@ openstack-phase2: - [ "nova-cloud-controller:ha", "hacluster-nova:ha" ] - [ "openstack-dashboard:ha", "hacluster-horizon:ha" ] - [ "ceilometer:ha", "hacluster-ceilometer:ha" ] - - [ keystone, percona-cluster ] - - [ nova-cloud-controller, percona-cluster ] + - [ keystone, mysql ] + - [ nova-cloud-controller, mysql ] - [ nova-cloud-controller, rabbitmq-server ] - [ nova-cloud-controller, glance ] - [ nova-cloud-controller, keystone ] - [ nova-compute, nova-cloud-controller ] - - [ "nova-compute:shared-db", "percona-cluster:shared-db" ] + - [ "nova-compute:shared-db", "mysql:shared-db" ] - [ "nova-compute:amqp", "rabbitmq-server:amqp" ] - [ nova-compute, glance ] - - [ glance, percona-cluster ] + - [ glance, mysql ] - [ glance, keystone ] - [ openstack-dashboard, keystone ] - - [ neutron-api, percona-cluster ] + - [ neutron-api, mysql ] - [ neutron-api, rabbitmq-server ] - [ neutron-api, nova-cloud-controller ] - [ neutron-api, keystone ] @@ -258,7 +264,7 @@ openstack-phase2: - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ] - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ] - [ "ceilometer:shared-db", "mongodb:database" ] - - [ "heat:shared-db", "percona-cluster:shared-db" ] + - [ "heat:shared-db", "mysql:shared-db" ] - [ "heat:identity-service", "keystone:identity-service" ] - [ "heat:amqp", "rabbitmq-server:amqp" ] - [ "cinder:image-service", "glance:image-service" ] @@ -267,13 +273,18 @@ openstack-phase2: - [ "cinder:cinder-volume-service", "nova-cloud-controller:cinder-volume-service" ] - [ "cinder-ceph:storage-backend", "cinder:storage-backend" ] - [ "ceph:client", "nova-compute:ceph" ] - - [ "cinder:shared-db", "percona-cluster:shared-db" ] + - [ "cinder:shared-db", "mysql:shared-db" ] - [ "ceph:client", "cinder-ceph:ceph" ] - [ "ceph:client", "glance:ceph" ] - [ "ceph-osd:mon", "ceph:osd" ] - [ "ceph-radosgw:mon", "ceph:radosgw" ] - [ "ceph-radosgw:identity-service", "keystone:identity-service" ] - + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp contrail: inherits: openstack-phase2 services: diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml index 44d4bc8d..0f73df76 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml @@ -153,6 +153,12 @@ openstack-phase2: num_units: 1 to: - "lxc:nodes-api=0" + congress: + charm: local:trusty/congress + options: + source-branch: stable/liberty + to: + - "lxc:nodes-api=0" relations: - [ keystone, mysql ] - [ nova-cloud-controller, mysql ] @@ -192,6 +198,12 @@ openstack-phase2: - [ "ceph-osd:mon", "ceph:osd" ] - [ "ceph-radosgw:mon", "ceph:radosgw" ] - [ "ceph-radosgw:identity-service", "keystone:identity-service"] + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp contrail: inherits: openstack-phase2 services: diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml index c792310a..d69388c1 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml @@ -159,6 +159,12 @@ openstack-phase2: num_units: 1 to: - "lxc:nodes-api=0" + congress: + charm: local:trusty/congress + options: + source-branch: stable/liberty + to: + - "lxc:nodes-api=0" relations: - [ keystone, mysql ] - [ nova-cloud-controller, mysql ] @@ -195,6 +201,12 @@ openstack-phase2: - [ "cinder:shared-db", "mysql:shared-db" ] - [ "ceph:client", "cinder-ceph:ceph" ] - [ "ceph:client", "glance:ceph" ] + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp contrail: inherits: openstack-phase2 services: |