The haproxy charm update for the OpenContrail HA bundle.

[joid.git] / ci / opencontrail / juju-deployer / ovs-opencontrail-ha.yaml

diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 90b85f6..e09a1d7 100644 (file)
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -10,8 +10,11 @@ openstack-phase1:
       charm: "cs:trusty/ubuntu"
       num_units: 2
       constraints: tags=compute
-    "ntp": 
+    ntp:
       charm: "cs:trusty/ntp"
+      options:
+        source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
+        auto_peers: false
     zookeeper:
       branch: lp:~charmers/charms/precise/zookeeper/trunk
       num_units: 3
@@ -37,51 +40,51 @@ openstack-phase1:
 openstack-phase2: 
   inherits: openstack-phase1
   services: 
-    "percona-cluster": 
+    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
+        dataset-size: 2G
+        lp1366997-workaround: true
+        max-connections: 10000
+        root-password: 293rhc395m
+        sst-password: 127rc14t51
         vip: 10.4.1.15
       to:
         - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-    "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='
-    "hacluster-ceilometer":
-      charm: "cs:trusty/hacluster"
+    hacluster-ceilometer:
+      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
       options:
         corosync_key: |
           'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
-    "ceilometer":
+    ceilometer:
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
       num_units: 3
       options:
@@ -90,9 +93,9 @@ openstack-phase2:
         - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-    "ceilometer-agent":
+    ceilometer-agent:
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
-    "mongodb":
+    mongodb:
       charm: "cs:trusty/mongodb"
       num_units: 1
       to:
@@ -102,31 +105,31 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceph:
-      charm: cs:trusty/ceph
-      num_units: 2
+      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: /srv
-        monitor-count: 1
-        osd-reformat: 'no'
+        osd-devices: ""
+        monitor-count: 3
+#        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"
+        - "lxc:nodes-api=2"
+        - "lxc:nodes-api=0"
+        - "lxc:nodes-api=1"
     ceph-osd:
-      charm: cs:trusty/ceph-osd
-      num_units: 3
+      branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next
+      num_units: 2
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
-        - "nodes-api=0"
-        - "nodes-api=1"
-        - "nodes-api=2"
+        - "nodes-compute=0"
+        - "nodes-compute=1"
     ceph-radosgw:
-      charm: cs:trusty/ceph-radosgw
+      branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -135,7 +138,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
 
     cinder:
-      charm: cs:trusty/cinder
+      branch: lp:~openstack-charmers/charms/trusty/cinder/next
       num_units: 3
       options:
         block-device: None
@@ -146,27 +149,27 @@ openstack-phase2:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     cinder-ceph:
-      charm: cs:trusty/cinder-ceph
-    "rabbitmq-server": 
-      branch: lp:charms/trusty/rabbitmq-server
+      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=1"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
-    "keystone": 
-      branch: lp:charms/trusty/keystone
+    keystone: 
+      branch: lp:~openstack-charmers/charms/trusty/keystone/next
       num_units: 3
       options: 
-        "admin-password": openstack
-        "admin-token": admin
+        admin-password: openstack
+        admin-token: admin
         vip: 10.4.1.13
       to:
         - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-    "openstack-dashboard": 
-      branch: lp:charms/trusty/openstack-dashboard
+    openstack-dashboard: 
+      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
       num_units: 3
       options: 
         secret: admin
@@ -176,33 +179,34 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
-    "nova-compute": 
+    nova-compute: 
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
       num_units: 2
       options: 
-        "enable-live-migration": False
-        "manage-neutron-plugin-legacy-mode": False
+        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": 
-      branch: lp:charms/trusty/nova-cloud-controller
+    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
+        console-access-protocol: novnc
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+        service-guard: true
+        neutron-external-network: ext_net
         vip: 10.4.1.16
       to:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
-    "neutron-api": 
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+    neutron-api: 
+      branch: lp:~opnfv-team/charms/trusty/neutron-api/next
       num_units: 3
       options:
         neutron-security-groups: True
@@ -212,8 +216,8 @@ openstack-phase2:
         - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
-    "glance": 
-      branch: lp:charms/trusty/glance
+    glance: 
+      branch: lp:~openstack-charmers/charms/trusty/glance/next
       num_units: 3
       options: 
         vip: 10.4.1.12
@@ -221,6 +225,11 @@ openstack-phase2:
         - "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"
   relations:
     - [ "glance:ha", "hacluster-glance:ha" ]
     - [ "keystone:ha", "hacluster-keystone:ha" ]
@@ -297,11 +306,11 @@ contrail:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     neutron-api-contrail:
-      branch: lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk
+      branch: lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk
     neutron-contrail:
-      branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk
+      branch: lp:~opnfv-team/charms/trusty/neutron-contrail/trunk
     haproxy:
-      charm: cs:trusty/haproxy
+      branch: lp:~opnfv-team/charms/trusty/haproxy/trunk
       num_units: 2
       options:
         peering_mode: active-active
@@ -326,7 +335,8 @@ contrail:
     - [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ]
     - [ contrail-control, keystone ]
     - [ "contrail-analytics:cassandra", "cassandra:database" ]
-    - [ contrail-analytics, contrail-configuration ]
+    - [ "contrail-analytics:contrail-analytics-api", "contrail-configuration:contrail-analytics-api" ]
+    - [ "contrail-configuration:contrail-discovery", "contrail-analytics:contrail-discovery" ]
     - [ contrail-webui, keystone ]
     - [ "contrail-webui:contrail_api", "contrail-configuration:contrail-api" ]
     - [ "contrail-webui:contrail_discovery", "contrail-configuration:contrail-discovery" ]
@@ -335,6 +345,9 @@ contrail:
     - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ]
     - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]
     - [ neutron-contrail, keystone ]
+    - [ contrail-configuration, ntp ]
+    - [ contrail-control, ntp ]
+    - [ contrail-analytics, ntp ]
     - [ contrail-configuration, haproxy ]
     - [ contrail-analytics, haproxy ]
     - [ contrail-webui, haproxy ]
@@ -351,6 +364,7 @@ trusty-liberty:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-liberty
@@ -371,6 +385,7 @@ trusty-kilo:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-kilo
@@ -390,6 +405,7 @@ trusty-juno:
   overrides:
     series: trusty
     #os-data-network: 10.4.8.0/21
+    #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
     region: Canonical
     openstack-origin: cloud:trusty-juno