modified the bundle to integrete the Ceph.

Change-Id: I776811240964c52fae9c9b6b1e4d1afa7c74760c
Author: Narinder Gupta <narinder.gupta@canonical.com>

1 files changed, 40 insertions, 21 deletions

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index f727c3ed..30b3757d 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -84,45 +84,46 @@ openstack-phase2:
       branch: "lp:~openstack-charmers/charms/trusty/heat/next"
       to:
         - "lxc:nodes-api=0"
-#    ceph:
-#      charm: cs:trusty/ceph
-#      num_units: 1
-#      options:
-#        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-#        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-#        osd-devices: /dev/sdb
+    ceph:
+      charm: cs:trusty/ceph
+      num_units: 1
+      options:
+        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+        osd-devices: /srv
+        monitor-count: 1        
 #        osd-reformat: 'yes'
-#        source: cloud:trusty-kilo
-#      to:
-#        - "nodes-compute=0"
+#        ceph-cluster-network: 192.168.0.0/24
+#        ceph-public-network: 192.168.0.0/24
+      to:
+        - "nodes-compute=0"
+#        - "nodes-compute=1"
 #    ceph-osd:
 #      charm: cs:trusty/ceph-osd
 #      num_units: 1
 #      options:
 #        osd-devices: /dev/sdb
 #        osd-reformat: 'yes'
-#        source: cloud:trusty-kilo
 #      to:
 #        - "lxc:nodes-api=0"
 #    ceph-radosgw:
 #      charm: cs:trusty/ceph-radosgw
 #      num_units: 1
 #      options:
-#        source: cloud:trusty-kilo
 #        use-embedded-webserver: true
 #      to:
 #        - "lxc:nodes-api=0"
-#    cinder:
-#      charm: cs:trusty/cinder
-#      num_units: 1
-#      options:
-#        block-device: None
+    cinder:
+      charm: cs:trusty/cinder
+      num_units: 1
+      options:
+        block-device: None
 #        glance-api-version: 2
 #        ha-mcastport: 5401
-#      to:
-#        - "lxc:nodes-api=0"
-#    cinder-ceph:
-#      charm: cs:trusty/cinder-cep
+      to:
+        - "lxc:nodes-api=0"
+    cinder-ceph:
+      charm: cs:trusty/cinder-ceph
     "rabbitmq-server": 
       branch: lp:charms/trusty/rabbitmq-server
       num_units: 3
@@ -301,6 +302,24 @@ openstack-phase2:
       - "keystone:identity-service"
     - - "heat:amqp"
       - "rabbitmq-server:amqp"
+    - - "cinder:image-service"
+      - "glance:image-service"
+    - - "cinder:amqp"
+      - "rabbitmq-server:amqp"
+    - - "cinder:identity-service"
+      - "keystone:identity-service"
+    - - "cinder:cinder-volume-service"
+      - "nova-cloud-controller:cinder-volume-service"
+    - - "cinder-ceph:storage-backend"
+      - "cinder:storage-backend"
+    - - "ceph:client"
+      - "nova-compute:ceph"
+    - - "cinder:shared-db"
+      - "percona-cluster:shared-db"
+    - - "ceph:client"
+      - "cinder-ceph:ceph"
+    - - "ceph:client"
+      - "glance:ceph"
 trusty-liberty-nodes:
   inherits: openstack-phase1
   overrides: