diff options
Diffstat (limited to 'ci/odl')
| -rwxr-xr-x | ci/odl/fetch-charms.sh | 11 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 26 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 14 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 12 |
4 files changed, 53 insertions, 10 deletions
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index b9e30e3b..8d29e05c 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/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 -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 @@ -26,9 +32,10 @@ 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 git clone https://github.com/openstack/charm-odl-controller.git $distro/odl-controller git clone https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl git clone https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl - diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 39864ffd..9a24bdc3 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -64,9 +64,9 @@ openstack-phase2: - - "neutron-api-odl:odl-controller" - "odl-controller:controller-api" - - "keystone:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "nova-cloud-controller:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "nova-cloud-controller:amqp" - "rabbitmq-server:amqp" - - "nova-cloud-controller:image-service" @@ -80,7 +80,7 @@ openstack-phase2: - - "nova-compute:image-service" - "glance:image-service" - - "glance:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "glance:identity-service" - "keystone:identity-service" - - "glance:amqp" @@ -88,7 +88,7 @@ openstack-phase2: - - "openstack-dashboard:identity-service" - "keystone:identity-service" - - "neutron-api:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "neutron-api:amqp" - "rabbitmq-server:amqp" - - "nova-cloud-controller:neutron-api" @@ -114,7 +114,7 @@ openstack-phase2: - - "ceilometer:shared-db" - "mongodb:database" - - "heat:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "heat:identity-service" - "keystone:identity-service" - - "heat:amqp" @@ -132,7 +132,7 @@ openstack-phase2: - - "ceph:client" - "nova-compute:ceph" - - "cinder:shared-db" - - "percona-cluster:shared-db" + - "mysql:shared-db" - - "ceph:client" - "cinder-ceph:ceph" - - "ceph:client" @@ -145,6 +145,12 @@ openstack-phase2: - "keystone:identity-service" #- - nova-compute:lxd #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: hacluster-keystone: charm: "local:trusty/hacluster" @@ -191,7 +197,7 @@ openstack-phase2: # options: # corosync_key: | # 'tk8U/FkH1+dNsvj6IU0C8AST7i/9ylIoCD8kWpPjB+UE2AYR7tkgkjnc4m5dzIYPYTceY7Hnb9xLJ0nlcQLYYFBRAJOg3drNTcVrfh63y9g9La1J1r51YSbOqXq1Q6RUhxP4OQBtDGE6/4NtZwuRPvPGLcI2ENiVm78l8JFkXRw=' - percona-cluster: + mysql: charm: "local:trusty/percona-cluster" num_units: 3 options: @@ -393,3 +399,9 @@ openstack-phase2: security-groups: True openvswitch-odl: charm: local:trusty/openvswitch-odl + congress: + charm: local:trusty/congress + options: + source-branch: stable/liberty + to: + - "lxc:nodes=0" diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index fc9e9edd..d414ba09 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -127,6 +127,12 @@ openstack-phase2: - "keystone:identity-service" #- - nova-compute:lxd #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: mysql: charm: "local:trusty/percona-cluster" @@ -257,7 +263,7 @@ openstack-phase2: opnfv-promise: branch: lp:~narindergupta/charms/trusty/promise/trunk to: - - "lxc:nodes=1" + - "lxc:nodes=0" neutron-api-odl: charm: local:trusty/neutron-api-odl options: @@ -265,3 +271,9 @@ openstack-phase2: security-groups: True openvswitch-odl: charm: local:trusty/openvswitch-odl + congress: + charm: local:trusty/congress + options: + source-branch: stable/liberty + to: + - "lxc:nodes=1" diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index ed34e932..e721f7de 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -129,6 +129,12 @@ openstack-phase2: - "keystone:identity-service" #- - nova-compute:lxd #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp services: mysql: charm: "local:trusty/percona-cluster" @@ -273,3 +279,9 @@ openstack-phase2: security-groups: True openvswitch-odl: charm: local:trusty/openvswitch-odl + congress: + charm: local:trusty/congress + options: + source-branch: stable/liberty + to: + - "lxc:nodes=0" |