extra space caused failure this time.

[joid.git] / ci / odl / juju-deployer / ovs-odl-nonha.yaml

diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index d4c398d..ed2aba2 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -10,7 +10,7 @@ openstack-phase1:
       charm: "cs:trusty/ubuntu"
       num_units: 1
       constraints: tags=compute
-    "ntp": 
+    ntp: 
       charm: "cs:trusty/ntp"
   relations:
     - - "ntp:juju-info"
@@ -20,22 +20,22 @@ openstack-phase1:
 openstack-phase2: 
   inherits: openstack-phase1
   services: 
-    "mysql": 
+    mysql: 
       branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
       num_units: 1
       options: 
-        "dataset-size": 2G
-        "max-connections": 10000
+        dataset-size: 2G
+        max-connections: 10000
       to:
         - "lxc:nodes-api=0"
-    "ceilometer":
+    ceilometer:
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "ceilometer-agent":
+    ceilometer-agent:
       branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
-    "mongodb":
+    mongodb:
       charm: "cs:trusty/mongodb"
       num_units: 1
       to:
@@ -58,7 +58,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceph-osd:
-      charm: cs:trusty/ceph-osd
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
       num_units: 1
       options:
         osd-devices: /srv
@@ -66,7 +66,7 @@ openstack-phase2:
       to:
         - "nodes-compute=0"
     ceph-radosgw:
-      charm: cs:trusty/ceph-radosgw
+      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -83,21 +83,21 @@ openstack-phase2:
         - "lxc:nodes-api=0"
     cinder-ceph:
       branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
-    "rabbitmq-server": 
+    rabbitmq-server: 
       branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
-    "keystone": 
+    keystone: 
       branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
       num_units: 1
       options: 
 #        ha-mcastport: 5402
-        "admin-password": openstack
-        "admin-token": admin
+        admin-password: openstack
+        admin-token: admin
       to:
         - "lxc:nodes-api=0"
-    "openstack-dashboard": 
+    openstack-dashboard: 
       branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
       num_units: 1
       options: 
@@ -105,28 +105,28 @@ openstack-phase2:
         webroot: /
       to:
         - "lxc:nodes-api=0"
-    "nova-compute": 
+    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
+        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": 
+    nova-cloud-controller: 
       branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
       num_units: 1
       options: 
-        "console-access-protocol": novnc
-        "network-manager": Neutron
-        "quantum-security-groups": "yes"
+        console-access-protocol: novnc
+        network-manager: Neutron
+        quantum-security-groups: "yes"
       to:
         - "lxc:nodes-api=0"
-    "neutron-api": 
+    neutron-api: 
       branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
       num_units: 1
       options:
@@ -137,22 +137,21 @@ openstack-phase2:
     neutron-gateway:
       branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
       options:
-#        "ext-port": "eth1"
+        #ext-port: "eth1"
         plugin: ovs-odl
         instance-mtu: 1400
       to:  
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
+      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"
-        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
-        profile: "openvswitch-odl-lithium"
+        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=0"
-    "glance": 
+    glance: 
       branch: lp:~openstack-charmers/charms/trusty/glance/next
       num_units: 1
       to:
@@ -163,7 +162,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api-odl:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
       options:
         overlay-network-type: 'vxlan gre'
         security-groups: True
@@ -271,9 +270,12 @@ trusty-liberty:
     #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: 1
     admin-role: admin
@@ -290,9 +292,12 @@ trusty-kilo:
     #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: 1
     admin-role: admin
@@ -309,9 +314,12 @@ trusty-juno:
     #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: 1
     admin-role: admin