Code Review / joid.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
type replaced Memeber with Member. Reducing the OSD to signle
[joid.git] / ci / opencontrail / juju-deployer / contrail-ha.yaml
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index 5cb9949..90b85f6 100644 (file)
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -3,15 +3,32 @@ openstack-phase1:
   series: trusty
   services:
     nodes-api:
-      charm: "local:trusty/ubuntu-nodes-controller"
+      charm: "cs:trusty/ubuntu"
       num_units: 3
       constraints: tags=control
     nodes-compute:
-      charm: "local:trusty/ubuntu-nodes-compute"
-      num_units: 1
+      charm: "cs:trusty/ubuntu"
+      num_units: 2
       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=2"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+    cassandra:
+      branch: lp:~stub/charms/trusty/cassandra/noauthentication
+      num_units: 3
+      to:
+        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=2"
+      options:
+        authenticator: AllowAllAuthenticator
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
@@ -21,7 +38,7 @@ openstack-phase2:
   inherits: openstack-phase1
   services: 
     "percona-cluster": 
-      charm: "cs:trusty/percona-cluster"
+      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
       num_units: 3
       options: 
         "dataset-size": 2G
@@ -31,9 +48,9 @@ openstack-phase2:
         "sst-password": 127rc14t51
         vip: 10.4.1.15
       to:
+        - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
     "hacluster-keystone":
       charm: "cs:trusty/hacluster"
       options:
@@ -59,12 +76,83 @@ 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=2"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+    "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: 2
+      options:
+        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+        osd-devices: /srv
+        monitor-count: 1
+        osd-reformat: 'no'
+#        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: 3
+      options:
+        osd-devices: /srv
+        osd-reformat: 'yes'
+      to:
+        - "nodes-api=0"
+        - "nodes-api=1"
+        - "nodes-api=2"
+    ceph-radosgw:
+      charm: cs:trusty/ceph-radosgw
+      num_units: 1
+      options:
+        use-embedded-webserver: true
+        operator-roles: "Member,admin"
+      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
       to:
-        - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     "keystone": 
       branch: lp:charms/trusty/keystone
@@ -74,9 +162,9 @@ openstack-phase2:
         "admin-token": admin
         vip: 10.4.1.13
       to:
+        - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
     "openstack-dashboard": 
       branch: lp:charms/trusty/openstack-dashboard
       num_units: 3
@@ -90,13 +178,13 @@ openstack-phase2:
         - "lxc:nodes-api=2"
     "nova-compute": 
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
-      num_units: 1
+      num_units: 2
       options: 
         "enable-live-migration": False
         "manage-neutron-plugin-legacy-mode": False
       to:
         - "nodes-compute=0"
-#        - "nodes-compute=1"
+        - "nodes-compute=1"
 #        - "nodes-api=0"
 #        - "nodes-api=1"
 #        - "nodes-api=2"
@@ -110,8 +198,8 @@ openstack-phase2:
         "service-guard": true
         vip: 10.4.1.16
       to:
-        - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     "neutron-api": 
       branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
@@ -121,17 +209,17 @@ openstack-phase2:
         manage-neutron-plugin-legacy-mode: False
         vip: 10.4.1.17
       to: 
+        - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
     "glance": 
       branch: lp:charms/trusty/glance
       num_units: 3
       options: 
         vip: 10.4.1.12
       to:
-        - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
   relations:
     - [ "glance:ha", "hacluster-glance:ha" ]
@@ -139,6 +227,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 +245,31 @@ 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" ]
+    - [ "ceph-osd:mon", "ceph:osd" ]
+    - [ "ceph-radosgw:mon", "ceph:radosgw" ]
+    - [ "ceph-radosgw:identity-service", "keystone:identity-service" ]
+
 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
@@ -258,8 +351,13 @@ trusty-liberty:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-liberty
+    source: "cloud:trusty-liberty"
+    ceph-osd-replication-count: 2
+    admin-role: admin
+    keystone-admin-role: admin
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -273,8 +371,13 @@ trusty-kilo:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-kilo
+    source: "cloud:trusty-kilo"
+    ceph-osd-replication-count: 2
+    admin-role: admin
+    keystone-admin-role: admin
 
 trusty-juno-nodes:
   inherits: openstack-phase1
@@ -287,6 +390,11 @@ trusty-juno:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-juno
+    source: "cloud:trusty-juno"
+    ceph-osd-replication-count: 2
+    admin-role: admin
+    keystone-admin-role: admin
 
Flexible OPNFV platform deployment. Archived as per RT68096