modified the yaml on request from David from Orange so that
[joid.git] / ci / odl / juju-deployer / ovs-odl-ha.yaml
index 20c0efe..4b02f70 100644 (file)
@@ -3,36 +3,48 @@ openstack-phase1:
   series: trusty
   services:
     nodes-api:
-      branch: "lp:charms/trusty/ubuntu"
+      charm: "local:trusty/ubuntu-nodes-controller"
       num_units: 3
       constraints: tags=control
     nodes-compute:
-      branch: "lp:charms/trusty/ubuntu"
+      charm: "local:trusty/ubuntu-nodes-compute"
       num_units: 1
       constraints: tags=compute
-    neutron-gateway:
-      branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
-#      constraints: tags=gateway
-      options:
-#        "ext-port": eth1
-        plugin: ovs-odl
-#        instance-mtu: 1400
-      to: nodes-api=0
     "ntp": 
       charm: "cs:trusty/ntp"
-    openvswitch-odl:
-      branch: lp:~alai/charms/trusty/openvswitch-odl/trunk
-    "hacluster-keystone": 
+  relations:
+    - - "ntp:juju-info"
+      - "nodes-api:juju-info"
+    - - "ntp:juju-info"
+      - "nodes-compute:juju-info"
+openstack-phase2: 
+  inherits: openstack-phase1
+  services: 
+    "percona-cluster": 
+      charm: "cs:trusty/percona-cluster"
+      num_units: 3
+      options: 
+        "dataset-size": 2G
+        "lp1366997-workaround": true
+        "max-connections": 10000
+        "root-password": 293rhc395m
+        "sst-password": 127rc14t51
+        vip: 10.4.1.15
+      to:
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=2"
+    "hacluster-keystone":
       charm: "cs:trusty/hacluster"
       options:
         corosync_key: |
           'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
-    "hacluster-horizon": 
+    "hacluster-horizon":
       charm: "cs:trusty/hacluster"
       options:
         corosync_key: |
           'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
-    "hacluster-nova": 
+    "hacluster-nova":
       charm: "cs:trusty/hacluster"
       options:
         corosync_key: |
@@ -42,33 +54,90 @@ openstack-phase1:
       options:
         corosync_key: |
           'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
-    "hacluster-glance": 
+    "hacluster-glance":
       charm: "cs:trusty/hacluster"
       options:
         corosync_key: |
           'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
-  relations:
-    - - "ntp:juju-info"
-      - "nodes-api:juju-info"
-    - - "ntp:juju-info"
-      - "nodes-compute:juju-info"
-openstack-phase2: 
-  inherits: openstack-phase1
-  services: 
-    "nova-compute": 
-      charm: "cs:trusty/nova-compute"
+    "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
-      options: 
-        "enable-live-migration": true
-        "enable-resize": true
-        "migration-auth-type": ssh
+      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: '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: 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
+      to:
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=2"
     "keystone": 
-      charm: "cs:trusty/keystone"
+      branch: lp:charms/trusty/keystone
       num_units: 3
       options: 
+#        ha-mcastport: 5402
         "admin-password": openstack
         "admin-token": admin
         vip: 10.4.1.13
@@ -76,37 +145,31 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
-    "glance": 
-      charm: "cs:trusty/glance"
+    "openstack-dashboard": 
+      branch: lp:charms/trusty/openstack-dashboard
       num_units: 3
       options: 
-        vip: 10.4.1.12
+        secret: admin
+        vip: 10.4.1.11
+        webroot: /
       to:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
-    "neutron-api": 
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
-      options:
-        neutron-security-groups: False
-        manage-neutron-plugin-legacy-mode: False
-        vip: 10.4.1.17
-      to: 
-        - "lxc:nodes-api=0"
-        - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
-    neutron-api-odl:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
-      options:
-        overlay-network-type: 'vxlan gre'
-        security-groups: true
-    odl-controller:
-      branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
-      options:
-        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
-      to: lxc:nodes-api=1
+    "nova-compute": 
+      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      num_units: 1
+      options: 
+        "enable-live-migration": False
+        "manage-neutron-plugin-legacy-mode": False
+      to:
+        - "nodes-compute=0"
+#        - "nodes-compute=1"
+#        - "nodes-api=0"
+#        - "nodes-api=1"
+#        - "nodes-api=2"
     "nova-cloud-controller": 
-      charm: "cs:trusty/nova-cloud-controller"
+      branch: lp:charms/trusty/nova-cloud-controller
       num_units: 3
       options: 
         "console-access-protocol": novnc
@@ -118,40 +181,52 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
-    "openstack-dashboard": 
-      charm: "cs:trusty/openstack-dashboard"
+    "neutron-api": 
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
       num_units: 3
-      options: 
-        secret: admin
-        vip: 10.4.1.11
-        webroot: /
-      to:
+      options:
+        neutron-security-groups: True
+        manage-neutron-plugin-legacy-mode: False
+        vip: 10.4.1.17
+      to: 
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
-    "rabbitmq-server": 
-      charm: "cs:trusty/rabbitmq-server"
-      num_units: 3
-      options: 
-        management_plugin: true
-      to:
-        - "lxc:nodes-api=0"
+    neutron-gateway:
+      branch: lp:charms/trusty/neutron-gateway
+      options:
+#        "ext-port": "eth1"
+        plugin: ovs-odl
+        instance-mtu: 1400
+      to:  
+        - "nodes-api=0"
+    odl-controller:
+      branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+      options:
+        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
+#        install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
+        http-proxy: "http://squid.internal:3128"
+        https-proxy: "http://squid.internal:3128"
+
+      to: 
         - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
-    "percona-cluster": 
-      charm: "cs:trusty/percona-cluster"
+    "glance": 
+      branch: lp:charms/trusty/glance
       num_units: 3
       options: 
-        "dataset-size": 2G
-        "lp1366997-workaround": true
-        "max-connections": 10000
-        "root-password": 293rhc395m
-        "sst-password": 127rc14t51
-        vip: 10.4.1.15
+        vip: 10.4.1.12
+#        ha-mcastport: 5402
       to:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
+    neutron-api-odl:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+      options:
+        overlay-network-type: 'vxlan gre'
+        security-groups: True
+    openvswitch-odl:
+      branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
   relations:
     - - "glance:ha"
       - "hacluster-glance:ha"
@@ -163,68 +238,142 @@ openstack-phase2:
       - "hacluster-nova:ha"
     - - "openstack-dashboard:ha"
       - "hacluster-horizon:ha"
-    - - "nova-compute:amqp"
-      - "rabbitmq-server:amqp"
-    - - "neutron-gateway:amqp"
+    - - "ceilometer:ha"
+      - "hacluster-ceilometer:ha"
+    - - "neutron-api:neutron-plugin-api-subordinate"
+      - "neutron-api-odl:neutron-plugin-api-subordinate"
+    - - "nova-compute:neutron-plugin"
+      - "openvswitch-odl:neutron-plugin"
+    - - "neutron-gateway"
+      - "openvswitch-odl"
+    - - "openvswitch-odl:ovsdb-manager"
+      - "odl-controller:ovsdb-manager"
+    - - "neutron-api-odl:odl-controller"
+      - "odl-controller:controller-api"
+    - - "keystone:shared-db"
+      - "percona-cluster:shared-db"
+    - - "nova-cloud-controller:shared-db"
+      - "percona-cluster:shared-db"
+    - - "nova-cloud-controller:amqp"
       - "rabbitmq-server:amqp"
+    - - "nova-cloud-controller:image-service"
+      - "glance:image-service"
     - - "nova-cloud-controller:identity-service"
       - "keystone:identity-service"
+    - - "nova-cloud-controller:cloud-compute"
+      - "nova-compute:cloud-compute"
+    - - "nova-compute:amqp"
+      - "rabbitmq-server:amqp"
+    - - "nova-compute:image-service"
+      - "glance:image-service"
+    - - "glance:shared-db"
+      - "percona-cluster:shared-db"
     - - "glance:identity-service"
       - "keystone:identity-service"
-    - - "neutron-api:identity-service"
+    - - "glance:amqp"
+      - "rabbitmq-server:amqp"
+    - - "openstack-dashboard:identity-service"
       - "keystone:identity-service"
+    - - "neutron-api:shared-db"
+      - "percona-cluster:shared-db"
     - - "neutron-api:amqp"
       - "rabbitmq-server:amqp"
+    - - "nova-cloud-controller:neutron-api"
+      - "neutron-api:neutron-api"
+    - - "neutron-api:identity-service"
+      - "keystone:identity-service"
+    - - "neutron-gateway:amqp"
+      - "rabbitmq-server:amqp"
     - - "neutron-gateway:neutron-plugin-api"
       - "neutron-api:neutron-plugin-api"
-    - - "glance:amqp"
-      - "rabbitmq-server:amqp"
-    - - "nova-cloud-controller:image-service"
-      - "glance:image-service"
-    - - "nova-compute:image-service"
-      - "glance:image-service"
-    - - "nova-cloud-controller:cloud-compute"
-      - "nova-compute:cloud-compute"
-    - - "nova-cloud-controller:amqp"
-      - "rabbitmq-server:amqp"
     - - "nova-cloud-controller:quantum-network-service"
       - "neutron-gateway:quantum-network-service"
-    - - "openstack-dashboard:identity-service"
+    - - "ceilometer:amqp"
+      - "rabbitmq-server:amqp"
+    - - "ceilometer-agent:ceilometer-service"
+      - "ceilometer:ceilometer-service"
+    - - "ceilometer:identity-service"
       - "keystone:identity-service"
-    - - "nova-cloud-controller:neutron-api"
-      - "neutron-api:neutron-api"
-    - - "neutron-gateway:shared-db"
+    - - "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"
-    - - "glance:shared-db"
-      - "percona-cluster:shared-db"
-    - - "keystone:shared-db"
-      - "percona-cluster:shared-db"
-    - - "nova-cloud-controller:shared-db"
-      - "percona-cluster:shared-db"
-    - - "neutron-api: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"
-    - - "neutron-api:neutron-plugin-api-subordinate"
-      - "neutron-api-odl:neutron-plugin-api-subordinate"
-    - - "nova-compute:neutron-plugin"
-      - "openvswitch-odl:neutron-plugin"
-    - - "neutron-gateway"
-      - "openvswitch-odl"
-    - - "openvswitch-odl:ovsdb-manager"
-      - "odl-controller:ovsdb-manager"
-    - - "neutron-api-odl:odl-controller"
-      - "odl-controller:controller-api"
+    - - "ceph:client"
+      - "cinder-ceph:ceph"
+    - - "ceph:client"
+      - "glance:ceph"
+trusty-liberty-nodes:
+  inherits: openstack-phase1
+  overrides:
+    series: trusty
+
+trusty-liberty:
+  inherits: openstack-phase2
+  overrides:
+    cluster_count: 3
+    #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
+    region: Canonical
+    source: "cloud:trusty-liberty"
+    "openstack-origin": "cloud:trusty-liberty"
+    series: trusty
+    ceph-osd-replication-count: 1
+
+trusty-kilo-nodes:
+  inherits: openstack-phase1
+  overrides:
+    series: trusty
+
 trusty-kilo:
   inherits: openstack-phase2
   overrides:
+    cluster_count: 3
+    #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-kilo"
     "openstack-origin": "cloud:trusty-kilo"
     series: trusty
+    ceph-osd-replication-count: 1
+
+
+trusty-juno-nodes:
+  inherits: openstack-phase1
+  overrides:
+    series: trusty
+
 trusty-juno:
   inherits: openstack-phase2
   overrides:
+    cluster_count: 3
+    #os-data-network: 10.4.8.0/21
+    #prefer-ipv6: true
     region: Canonical
     source: "cloud:trusty-juno"
     "openstack-origin": "cloud:trusty-juno"
     series: trusty
+    ceph-osd-replication-count: 1
+