diff options
Diffstat (limited to 'ci/onos')
| -rwxr-xr-x | ci/onos/fetch-charms.sh | 10 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/ovs-onos-ha.yaml | 27 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/ovs-onos-nonha.yaml | 12 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/ovs-onos-tip.yaml | 13 |
4 files changed, 52 insertions, 10 deletions
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index f447fff5..262e44db 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/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 @@ -25,6 +31,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:~wuwenbin2/onosfw/onos-controller $distro/onos-controller diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index 0d7a2b9f..120ed3cd 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -58,9 +58,9 @@ openstack-phase2: - - "neutron-api-onos:onos-controller" - "onos-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" @@ -74,7 +74,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" @@ -82,7 +82,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" @@ -108,7 +108,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" @@ -126,7 +126,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" @@ -139,7 +139,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" @@ -171,7 +176,7 @@ openstack-phase2: options: corosync_key: | 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' - percona-cluster: + mysql: charm: "local:trusty/percona-cluster" num_units: 3 options: @@ -355,3 +360,9 @@ openstack-phase2: security-groups: True openvswitch-onos: charm: "local:trusty/openvswitch-onos" + congress: + charm: local:trusty/congress + options: + source-branch: stable/liberty + to: + - "lxc:nodes=0" diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml index 31a7e155..76825610 100644 --- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-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" @@ -261,3 +267,9 @@ openstack-phase2: security-groups: True openvswitch-onos: charm: "local:trusty/openvswitch-onos" + congress: + charm: local:trusty/congress + options: + source-branch: stable/liberty + to: + - "lxc:nodes=0" diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml index 8b4cd6dd..ff53bb4a 100644 --- a/ci/onos/juju-deployer/ovs-onos-tip.yaml +++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml @@ -125,7 +125,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" @@ -266,3 +271,9 @@ openstack-phase2: security-groups: True openvswitch-onos: charm: "local:trusty/openvswitch-onos" + congress: + charm: local:trusty/congress + options: + source-branch: stable/liberty + to: + - "lxc:nodes=0" |