X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fodl%2Fjuju-deployer%2Fovs-odl.yaml;h=b120f41689e0d19a01829f4b3dc3c57076f29e6c;hb=796db0fbdb49c499464720cf11587de7e184120b;hp=0ab46c76d4b40699f453e375c40bb93cfff4ffad;hpb=cb5a719425069adfbf539260fa422c1aa1404004;p=joid.git

diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
index 0ab46c76..b120f416 100644
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@ -3,11 +3,11 @@ openstack-phase1:
   series: trusty
   services:
     nodes-api:
-      charm: "local:trusty/ubuntu-nodes-controller"
+      charm: "cs:trusty/ubuntu"
       num_units: 1
       constraints: tags=control
     nodes-compute:
-      charm: "local:trusty/ubuntu-nodes-compute"
+      charm: "cs:trusty/ubuntu"
       num_units: 1
       constraints: tags=compute
     "ntp": 
@@ -52,7 +52,7 @@ openstack-phase2:
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
         osd-devices: /srv
         monitor-count: 1        
-#        osd-reformat: 'yes'
+        osd-reformat: 'no'
 #        ceph-cluster-network: 192.168.0.0/24
 #        ceph-public-network: 192.168.0.0/24
       to:
@@ -96,6 +96,7 @@ openstack-phase2:
 #        ha-mcastport: 5402
         "admin-password": openstack
         "admin-token": admin
+        "admin-role": admin
       to:
         - "lxc:nodes-api=0"
     "openstack-dashboard": 
@@ -144,10 +145,10 @@ openstack-phase2:
       to:  
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
       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"
+        #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"