added few more proxy, ntp and promise charm.

[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 d414ba0..96c8c04 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -1,8 +1,6 @@
 # vim: set ts=2 et:
 trusty-mitaka-nodes:
   inherits: openstack-phase1
-  overrides:
-    series: trusty
 
 trusty-mitaka:
   inherits: openstack-phase2
@@ -15,13 +13,11 @@ trusty-mitaka:
     region: Canonical
     #source: "cloud:trusty-mitaka"
     openstack-origin: "cloud:trusty-mitaka"
-    series: trusty
     ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin
 
 openstack-phase1:
-  series: trusty
   services:
     nodes:
       charm: "cs:trusty/ubuntu"
@@ -161,7 +157,6 @@ openstack-phase2:
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: ""
         monitor-count: 2
 #        osd-reformat: 'no'
 #        ceph-cluster-network: 192.168.0.0/24
@@ -190,7 +185,6 @@ openstack-phase2:
       options:
         block-device: None
         glance-api-version: 2
-#        ha-mcastport: 5401
       to:
         - "lxc:nodes=1"
     cinder-ceph:
@@ -202,7 +196,6 @@ openstack-phase2:
     keystone:
       charm: "local:trusty/keystone"
       options:
-#        ha-mcastport: 5402
         admin-password: openstack
         admin-token: admin
       to:
@@ -236,7 +229,7 @@ openstack-phase2:
       charm: local:trusty/neutron-api
       options:
         neutron-security-groups: True
-        flat-network-providers: "*"
+        manage-neutron-plugin-legacy-mode: False
       to:
         - "lxc:nodes=1"
     neutron-gateway:
@@ -261,7 +254,7 @@ openstack-phase2:
       to:
         - "lxc:nodes=1"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      charm: local:trusty/promise
       to:
         - "lxc:nodes=0"
     neutron-api-odl:
@@ -274,6 +267,6 @@ openstack-phase2:
     congress:
       charm: local:trusty/congress
       options:
-        source-branch: stable/liberty
+        #source-branch: stable/mitaka
       to:
         - "lxc:nodes=1"