adding contrail bundle with ceph, cinder, heat and ceilometer.

adding ha contrail bundle as well.
adding the openstack install from git

Change-Id: I354e677a4b29bfcd0aaf5d032a375afd8b0767a7

4 files changed, 298 insertions, 42 deletions

diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh
index 06c65792..71725110 100755
--- a/ci/opencontrail/01-deploybundle.sh
+++ b/ci/opencontrail/01-deploybundle.sh
@@ -42,7 +42,7 @@ case "$3" in
         # choose the correct interface to use for data network
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "eth2"/g' ./bundles.yaml
+         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "brPublic"/g' ./bundles.yaml
          ;;
      'intelpod5' )
          cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
@@ -54,7 +54,7 @@ case "$3" in
         # choose the correct interface to use for data network
          sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
         # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "eth2.724"/g' ./bundles.yaml
+         sed -i -- 's/#        "ext-port": "eth1"/        "ext-port": "brPublic"/g' ./bundles.yaml
         ;;
 esac
 
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index 5cb99499..c6ce1bf8 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -12,6 +12,23 @@ openstack-phase1:
       constraints: tags=compute
     "ntp": 
       charm: "cs:trusty/ntp"
+    zookeeper:
+      branch: lp:~charmers/charms/precise/zookeeper/trunk
+      num_units: 3
+      series: precise
+      to:
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=2"
+    cassandra:
+      branch: lp:~stub/charms/trusty/cassandra/noauthentication
+      num_units: 3
+      to:
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=2"
+      options:
+        authenticator: AllowAllAuthenticator
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -59,6 +76,73 @@ openstack-phase2:
       options:
         corosync_key: |
           'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
+    "hacluster-ceilometer":
+      charm: "cs:trusty/hacluster"
+      options:
+        corosync_key: |
+          'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
+    "ceilometer":
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      num_units: 3
+      options:
+        vip: 10.4.1.14
+      to:
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=2"
+    "ceilometer-agent":
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+    "mongodb":
+      charm: "cs:trusty/mongodb"
+      num_units: 1
+      to:
+        - "lxc:nodes-api=0"
+    heat:
+      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: /srv
+        monitor-count: 1
+#        osd-reformat: 'yes'
+#        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'
+#      to:
+#        - "lxc:nodes-api=0"
+#    ceph-radosgw:
+#      charm: cs:trusty/ceph-radosgw
+#      num_units: 1
+#      options:
+#        use-embedded-webserver: true
+#      to:
+#        - "lxc:nodes-api=0"
+    cinder:
+      charm: cs:trusty/cinder
+      num_units: 3
+      options:
+        block-device: None
+        glance-api-version: 2
+#        ha-mcastport: 5401
+      to:
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=2"
+    cinder-ceph:
+      charm: cs:trusty/cinder-ceph
     "rabbitmq-server": 
       branch: lp:charms/trusty/rabbitmq-server
       num_units: 3
@@ -139,6 +223,7 @@ openstack-phase2:
     - [ "neutron-api:ha", "hacluster-neutron:ha" ]
     - [ "nova-cloud-controller:ha", "hacluster-nova:ha" ]
     - [ "openstack-dashboard:ha", "hacluster-horizon:ha" ]
+    - [ "ceilometer:ha", "hacluster-ceilometer:ha" ] 
     - [ keystone, percona-cluster ]
     - [ nova-cloud-controller, percona-cluster ]
     - [ nova-cloud-controller, rabbitmq-server ]
@@ -156,27 +241,27 @@ openstack-phase2:
     - [ neutron-api, nova-cloud-controller ]
     - [ neutron-api, keystone ]
     - [ neutron-api, neutron-api-contrail ]
+    - [ "ceilometer:amqp", "rabbitmq-server:amqp" ]
+    - [ "ceilometer-agent:ceilometer-service", "ceilometer:ceilometer-service" ]
+    - [ "ceilometer:identity-service", "keystone:identity-service" ]
+    - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ]
+    - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ]
+    - [ "ceilometer:shared-db", "mongodb:database" ]
+    - [ "heat:shared-db", "percona-cluster:shared-db" ]
+    - [ "heat:identity-service", "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" ]
 contrail:
   inherits: openstack-phase2
   services:
-    cassandra:
-      branch: lp:~stub/charms/trusty/cassandra/noauthentication
-      num_units: 3
-      options:
-        authenticator: AllowAllAuthenticator
-      to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
-    zookeeper:
-      branch: lp:~charmers/charms/precise/zookeeper/trunk
-      num_units: 3
-      series: precise
-      to:
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
-      units: 3
     contrail-configuration:
       branch: lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk
       num_units: 2
@@ -260,6 +345,8 @@ trusty-liberty:
     #os-data-network: 10.4.8.0/21
     region: Canonical
     openstack-origin: cloud:trusty-liberty
+    source: "cloud:trusty-liberty"
+    ceph-osd-replication-count: 1
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -275,6 +362,8 @@ trusty-kilo:
     #os-data-network: 10.4.8.0/21
     region: Canonical
     openstack-origin: cloud:trusty-kilo
+    source: "cloud:trusty-kilo"
+    ceph-osd-replication-count: 1
 
 trusty-juno-nodes:
   inherits: openstack-phase1
@@ -289,4 +378,7 @@ trusty-juno:
     #os-data-network: 10.4.8.0/21
     region: Canonical
     openstack-origin: cloud:trusty-juno
+    source: "cloud:trusty-juno"
+    ceph-osd-replication-count: 1
+
 
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml
index be0ca99c..e881c29b 100644
--- a/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml
@@ -12,6 +12,17 @@ openstack-phase1:
       constraints: tags=compute
     "ntp":
       charm: "cs:trusty/ntp"
+    zookeeper:
+      branch: lp:~charmers/charms/precise/zookeeper/trunk
+      series: precise
+      to:
+        - "lxc:nodes-api=0"
+    cassandra:
+      branch: lp:~stub/charms/trusty/cassandra/noauthentication
+      to:
+        - "lxc:nodes-api=0"
+      options:
+        authenticator: AllowAllAuthenticator
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -28,6 +39,62 @@ openstack-phase2:
         "max-connections": 10000
       to:
         - "lxc:nodes-api=0"
+    "mongodb":
+      charm: "cs:trusty/mongodb"
+      num_units: 1
+      to:
+        - "lxc:nodes-api=0"
+    "ceilometer":
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      num_units: 1
+      to:
+        - "lxc:nodes-api=0"
+    "ceilometer-agent":
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+    heat:
+      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: /srv
+        monitor-count: 1
+#        osd-reformat: 'yes'
+#        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'
+#      to:
+#        - "lxc:nodes-api=0"
+#    ceph-radosgw:
+#      charm: cs:trusty/ceph-radosgw
+#      num_units: 1
+#      options:
+#        use-embedded-webserver: true
+#      to:
+#        - "lxc:nodes-api=0"
+    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-ceph
     "rabbitmq-server":
       branch: lp:charms/trusty/rabbitmq-server
       num_units: 1
@@ -100,20 +167,27 @@ openstack-phase2:
     - [ neutron-api, nova-cloud-controller ]
     - [ neutron-api, keystone ]
     - [ neutron-api, neutron-api-contrail ]
+    - [ "ceilometer:amqp", "rabbitmq-server:amqp" ]
+    - [ "ceilometer-agent:ceilometer-service", "ceilometer:ceilometer-service" ]
+    - [ "ceilometer:identity-service", "keystone:identity-service" ]
+    - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ]
+    - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ]
+    - [ "ceilometer:shared-db", "mongodb:database" ]
+    - [ "heat:shared-db", "mysql:shared-db" ]
+    - [ "heat:identity-service", "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", "mysql:shared-db" ]
+    - [ "ceph:client", "cinder-ceph:ceph" ]
+    - [ "ceph:client", "glance:ceph" ]
 contrail:
   inherits: openstack-phase2
   services:
-    zookeeper:
-      branch: lp:~charmers/charms/precise/zookeeper/trunk
-      series: precise
-      to:
-        - "lxc:nodes-api=0"
-    cassandra:
-      branch: lp:~stub/charms/trusty/cassandra/noauthentication
-      to:
-        - "lxc:nodes-api=0"
-      options:
-        authenticator: AllowAllAuthenticator
     contrail-configuration:
       branch:  lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk
       to:
@@ -175,6 +249,8 @@ trusty-liberty:
     #os-data-network: 10.4.8.0/21
     region: Canonical
     openstack-origin: cloud:trusty-liberty
+    source: "cloud:trusty-liberty"
+    ceph-osd-replication-count: 1
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -195,6 +271,9 @@ trusty-kilo:
     #os-data-network: 10.4.8.0/21
     region: Canonical
     openstack-origin: cloud:trusty-kilo
+    source: "cloud:trusty-kilo"
+    ceph-osd-replication-count: 1
+
 
 trusty-juno-nodes:
   inherits: openstack-phase1
@@ -214,4 +293,7 @@ trusty-juno:
     #os-data-network: 10.4.8.0/21
     region: Canonical
     openstack-origin: cloud:trusty-juno
+    source: "cloud:trusty-juno"
+    ceph-osd-replication-count: 1
+
 
diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml
index 99bb48ad..6e46daec 100644
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@ -12,6 +12,17 @@ openstack-phase1:
       constraints: tags=compute
     "ntp":
       charm: "cs:trusty/ntp"
+    zookeeper:
+      branch: lp:~charmers/charms/precise/zookeeper/trunk
+      series: precise
+      to:
+        - "lxc:nodes-api=0"
+    cassandra:
+      branch: lp:~stub/charms/trusty/cassandra/noauthentication
+      to:
+        - "lxc:nodes-api=0"
+      options:
+        authenticator: AllowAllAuthenticator
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -28,6 +39,62 @@ openstack-phase2:
         "max-connections": 10000
       to:
         - "lxc:nodes-api=0"
+    "mongodb":
+      charm: "cs:trusty/mongodb"
+      num_units: 1
+      to:
+        - "lxc:nodes-api=0"
+    "ceilometer":
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      num_units: 1
+      to:
+        - "lxc:nodes-api=0"
+    "ceilometer-agent":
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+    heat:
+      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: /srv
+        monitor-count: 1
+#        osd-reformat: 'yes'
+#        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'
+#      to:
+#        - "lxc:nodes-api=0"
+#    ceph-radosgw:
+#      charm: cs:trusty/ceph-radosgw
+#      num_units: 1
+#      options:
+#        use-embedded-webserver: true
+#      to:
+#        - "lxc:nodes-api=0"
+    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-ceph
     "rabbitmq-server":
       branch: lp:charms/trusty/rabbitmq-server
       num_units: 1
@@ -94,20 +161,27 @@ openstack-phase2:
     - [ neutron-api, nova-cloud-controller ]
     - [ neutron-api, keystone ]
     - [ neutron-api, neutron-api-contrail ]
+    - [ "ceilometer:amqp", "rabbitmq-server:amqp" ]
+    - [ "ceilometer-agent:ceilometer-service", "ceilometer:ceilometer-service" ]
+    - [ "ceilometer:identity-service", "keystone:identity-service" ]
+    - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ]
+    - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ]
+    - [ "ceilometer:shared-db", "mongodb:database" ]
+    - [ "heat:shared-db", "mysql:shared-db" ]
+    - [ "heat:identity-service", "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", "mysql:shared-db" ]
+    - [ "ceph:client", "cinder-ceph:ceph" ]
+    - [ "ceph:client", "glance:ceph" ]
 contrail:
   inherits: openstack-phase2
   services:
-    zookeeper:
-      branch: lp:~charmers/charms/precise/zookeeper/trunk
-      series: precise
-      to:
-        - "lxc:nodes-api=0"
-    cassandra:
-      branch: lp:~stub/charms/trusty/cassandra/noauthentication
-      to:
-        - "lxc:nodes-api=0"
-      options:
-        authenticator: AllowAllAuthenticator
     contrail-configuration:
       branch:  lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk
       to:
@@ -169,6 +243,8 @@ trusty-liberty:
     #os-data-network: 10.4.8.0/21
     region: Canonical
     openstack-origin: cloud:trusty-liberty
+    source: "cloud:trusty-liberty"
+    ceph-osd-replication-count: 1
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -189,6 +265,9 @@ trusty-kilo:
     #os-data-network: 10.4.8.0/21
     region: Canonical
     openstack-origin: cloud:trusty-kilo
+    source: "cloud:trusty-kilo"
+    ceph-osd-replication-count: 1
+
 
 trusty-juno-nodes:
   inherits: openstack-phase1
@@ -208,4 +287,7 @@ trusty-juno:
     #os-data-network: 10.4.8.0/21
     region: Canonical
     openstack-origin: cloud:trusty-juno
+    source: "cloud:trusty-juno"
+    ceph-osd-replication-count: 1
+