X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=ci%2Fodl%2Fjuju-deployer%2Fovs-odl-ha.yaml;h=0b3b93f36f7105425508ea87cf5341214a08b191;hb=c752a0d51dafc54b6158a675cadfc9fd072431b7;hp=35372d689ad6c95cc7e5d491a9e886817609778b;hpb=77d10468358b749b73f9d1c27f5091f46f9b9b2b;p=joid.git

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 35372d68..0b3b93f3 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -3,161 +3,238 @@ openstack-phase1:
   series: trusty
   services:
     nodes-api:
-      branch: "lp:charms/trusty/ubuntu"
+      charm: "cs:trusty/ubuntu"
       num_units: 3
       constraints: tags=control
     nodes-compute:
-      branch: "lp:charms/trusty/ubuntu"
-      num_units: 1
+      charm: "cs:trusty/ubuntu"
+      num_units: 2
       constraints: tags=compute
-    "ntp": 
+    ntp:
       charm: "cs:trusty/ntp"
   relations:
     - - "ntp:juju-info"
       - "nodes-api:juju-info"
     - - "ntp:juju-info"
       - "nodes-compute:juju-info"
-openstack-phase2: 
+openstack-phase2:
   inherits: openstack-phase1
-  services: 
-    "percona-cluster": 
-      charm: "cs:trusty/percona-cluster"
+  services:
+    percona-cluster:
+      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
       num_units: 3
-      options: 
-        "dataset-size": 2G
-        "lp1366997-workaround": true
-        "max-connections": 10000
-        "root-password": 293rhc395m
-        "sst-password": 127rc14t51
+      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=0"
         - "lxc:nodes-api=2"
-    "hacluster-keystone":
-      charm: "cs:trusty/hacluster"
+    hacluster-keystone:
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
-    "hacluster-horizon":
-      charm: "cs:trusty/hacluster"
+    hacluster-horizon:
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
-    "hacluster-nova":
-      charm: "cs:trusty/hacluster"
+    hacluster-nova:
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
-    "hacluster-neutron": 
-      charm: "cs:trusty/hacluster"
+    hacluster-neutron:
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
-    "hacluster-glance":
-      charm: "cs:trusty/hacluster"
+    hacluster-glance:
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
-    "rabbitmq-server": 
-      charm: "cs:trusty/rabbitmq-server"
+    hacluster-ceilometer:
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      options:
+        corosync_key: |
+          'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
+    ceilometer:
+      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
       num_units: 3
-      options: 
-        management_plugin: true
+      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:
+      branch: lp:~openstack-charmers/charms/trusty/ceph/next
+      num_units: 3
+      options:
+        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+        osd-devices: ""
+        monitor-count: 3
+#        osd-reformat: 'false'
+#        ceph-cluster-network: 192.168.0.0/24
+#        ceph-public-network: 192.168.0.0/24
       to:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
-    "keystone": 
-      charm: "cs:trusty/keystone"
+    ceph-osd:
+      branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next
+      num_units: 2
+      options:
+        osd-devices: /srv
+        osd-reformat: 'yes'
+      to:
+        - "nodes-compute=0"
+        - "nodes-compute=1"
+#        - "nodes-api=0"
+    ceph-radosgw:
+      branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
+      num_units: 1
+      options:
+        use-embedded-webserver: true
+        operator-roles: "Member,admin"
+      to:
+        - "lxc:nodes-api=0"
+    cinder:
+      branch: lp:~openstack-charmers/charms/trusty/cinder/next
       num_units: 3
-      options: 
-        "admin-password": openstack
-        "admin-token": admin
+      options:
+        block-device: None
+        glance-api-version: 2
+#        ha-mcastport: 5401
+      to:
+        - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=2"
+    cinder-ceph:
+      branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+    rabbitmq-server:
+      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+      num_units: 3
+      to:
+        - "lxc:nodes-api=2"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
+    keystone:
+      branch: lp:~openstack-charmers/charms/trusty/keystone/next
+      num_units: 3
+      options:
+#        ha-mcastport: 5402
+        admin-password: openstack
+        admin-token: admin
         vip: 10.4.1.13
       to:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
-    "openstack-dashboard": 
-      charm: "cs:trusty/openstack-dashboard"
+    openstack-dashboard:
+      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
       num_units: 3
-      options: 
+      options:
         secret: admin
         vip: 10.4.1.11
         webroot: /
       to:
-        - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
-    "nova-compute": 
-      branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
-      num_units: 4
-      options: 
-        "enable-live-migration": true
-        "enable-resize": true
-        "migration-auth-type": ssh
+    nova-compute:
+      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      num_units: 2
+      options:
+        enable-live-migration: true
+        enable-resize: true
+        manage-neutron-plugin-legacy-mode: false
+        migration-auth-type: ssh
       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"
+        - "nodes-compute=1"
+#        - "nodes-api=0"
+#        - "nodes-api=1"
+#        - "nodes-api=2"
+    nova-cloud-controller:
+      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
       num_units: 3
-      options: 
-        "console-access-protocol": novnc
-        "network-manager": Neutron
-        "quantum-security-groups": "yes"
-        "service-guard": true
+      options:
+        console-access-protocol: novnc
+        network-manager: Neutron
+        service-guard: true
+        neutron-external-network: ext_net
         vip: 10.4.1.16
       to:
+        - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-        - "lxc:nodes-api=2"
-    "neutron-api": 
+    neutron-api:
       branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
       num_units: 3
       options:
-        neutron-security-groups: False
+        neutron-security-groups: True
         manage-neutron-plugin-legacy-mode: False
         vip: 10.4.1.17
-      to: 
+      to:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     neutron-gateway:
-      branch: lp:~narindergupta/charms/trusty/neutron-gateway/ovs-odl
-#      num_units: 3
-#      constraints: tags=gateway
+      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
       options:
-#        "ext-port": eth1
+        #ext-port: "eth1"
         plugin: ovs-odl
-#        instance-mtu: 1400
-      to:  
+        instance-mtu: 1400
+      to:
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~narindergupta/charms/trusty/odl-controller/liberty
+      branch: lp:~opnfv-team/charms/trusty/odl-controller/Be
       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
-      to: 
-        - "nodes-api=0"
-    "glance": 
-      charm: "cs:trusty/glance"
+        install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz"
+        profile: "openvswitch-odl-Be"
+        http-proxy: "http://squid.internal:3128"
+        https-proxy: "http://squid.internal:3128"
+      to:
+        - "lxc:nodes-api=1"
+    glance:
+      branch: lp:~openstack-charmers/charms/trusty/glance/next
       num_units: 3
-      options: 
+      options:
         vip: 10.4.1.12
+#        ha-mcastport: 5402
       to:
-        - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=2"
+    opnfv-promise:
+      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      num_units: 1
+      to:
         - "lxc:nodes-api=2"
     neutron-api-odl:
-      branch: lp:~narindergupta/charms/trusty/neutron-api-odl/liberty
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
       options:
         overlay-network-type: 'vxlan gre'
-        security-groups: true
+        security-groups: True
     openvswitch-odl:
       branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
   relations:
@@ -171,56 +248,99 @@ 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"
-      - "percona-cluster:shared-db"
-    - - "glance: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"
-    - - "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"
+    - - "ceph-osd:mon"
+      - "ceph:osd"
+    - - "ceph-radosgw:mon"
+      - "ceph:radosgw"
+    - - "ceph-radosgw:identity-service"
+      - "keystone:identity-service"
+
 trusty-liberty-nodes:
   inherits: openstack-phase1
   overrides:
@@ -229,12 +349,20 @@ trusty-liberty-nodes:
 trusty-liberty:
   inherits: openstack-phase2
   overrides:
-    cluster_count: 3
+#    cluster_count: 3
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
+    #prefer-ipv6: true
+    #enable-dvr: true
+    #l2-population: true
+    #ext-port: "eth1"
     region: Canonical
     source: "cloud:trusty-liberty"
-    "openstack-origin": "cloud:trusty-liberty"
+    openstack-origin: "cloud:trusty-liberty"
     series: trusty
+    ceph-osd-replication-count: 2
+    admin-role: admin
+    keystone-admin-role: admin
 
 trusty-kilo-nodes:
   inherits: openstack-phase1
@@ -244,13 +372,20 @@ trusty-kilo-nodes:
 trusty-kilo:
   inherits: openstack-phase2
   overrides:
-    cluster_count: 3
+#    cluster_count: 3
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
+    #prefer-ipv6: true
+    #enable-dvr: true
+    #l2-population: true
+    #ext-port: "eth1"
     region: Canonical
     source: "cloud:trusty-kilo"
-    "openstack-origin": "cloud:trusty-kilo"
+    openstack-origin: "cloud:trusty-kilo"
     series: trusty
-
+    ceph-osd-replication-count: 2
+    admin-role: admin
+    keystone-admin-role: admin
 
 trusty-juno-nodes:
   inherits: openstack-phase1
@@ -260,11 +395,17 @@ trusty-juno-nodes:
 trusty-juno:
   inherits: openstack-phase2
   overrides:
-    cluster_count: 3
+#    cluster_count: 3
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
+    #prefer-ipv6: true
+    #enable-dvr: true
+    #l2-population: true
+    #ext-port: "eth1"
     region: Canonical
     source: "cloud:trusty-juno"
-    "openstack-origin": "cloud:trusty-juno"
+    openstack-origin: "cloud:trusty-juno"
     series: trusty
-
-
+    ceph-osd-replication-count: 2
+    admin-role: admin
+    keystone-admin-role: admin