diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-06-10 08:09:50 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-06-10 08:23:07 -0500 |
| commit | 6635edf1ab2858d2a8b058450aecad6a9d9c5d88 (patch) | |
| tree | 74ce91934b1e5f3186f9fe3dddde3f2bf376be76 /ci/nosdn | |
| parent | 7a8e2d62c4a16821ec46ab21445a7ebc702e0154 (diff) | |
modfied to include the congress charm which is part of OPNFV bundle
now.
Change-Id: Ifd91c3af7985cbc0ea5e4f4c08bbcdcec8ea3ba9
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/nosdn')
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 12 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 2 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 12 |
3 files changed, 25 insertions, 1 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index 662f190d..9eed91f3 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -137,6 +137,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: hacluster-keystone: @@ -336,3 +342,9 @@ openstack-phase2: charm: "local:trusty/heat" to: - "lxc:nodes=0" + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=0" diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index db7474e8..48f69c17 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -266,6 +266,6 @@ openstack-phase2: congress: charm: local:trusty/congress options: - source-branch: stable/liberty + source-branch: stable/mitaka to: - "lxc:nodes=1" diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 6ae2fc20..320b29e9 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -123,6 +123,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" @@ -259,3 +265,9 @@ openstack-phase2: #default-socket-memory: 1024 #defualt-socket-cores: 1 #dpdk-driver: uio_pci_generic + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=1" |