diff options
Diffstat (limited to 'ci/odl/juju-deployer')
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 12 | ||||
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 14 | ||||
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 12 |
3 files changed, 37 insertions, 1 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 39864ffd..be59ff6d 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -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" @@ -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/mitaka + 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..d4ca6019 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/mitaka + 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..67d2b239 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/mitaka + to: + - "lxc:nodes=0" |