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>

3 files changed, 43 insertions, 9 deletions

diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 0d7a2b9f..0f8bfa80 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/mitaka
+      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..1f022c5f 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/mitaka
+      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..e574bcc6 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/mitaka
+      to:
+        - "lxc:nodes=0"