Merge "cleanup and also fetch the charms first then deploy."

1 files changed, 19 insertions, 19 deletions

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index b03f411d..dd370877 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -21,7 +21,7 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     mysql:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+      charm: "local:trusty/percona-cluster"
       num_units: 1
       options:
         dataset-size: 2G
@@ -29,23 +29,23 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      charm: "local:trusty/ceilometer"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     ceilometer-agent:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+      charm: "local:trusty/ceilometer-agent"
     mongodb:
       charm: "cs:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+      charm: "local:trusty/heat"
       to:
         - "lxc:nodes-api=0"
     ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
+      charm: "local:trusty/ceph"
       num_units: 2
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -59,7 +59,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=0"
     ceph-osd:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
+      charm: "local:trusty/ceph-osd"
       num_units: 2
       options:
         osd-devices: /srv
@@ -68,7 +68,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     ceph-radosgw:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
+      charm: "local:trusty/ceph-radosgw"
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -76,7 +76,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
+      charm: "local:trusty/cinder"
       num_units: 1
       options:
         block-device: None
@@ -86,14 +86,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
+      charm: "local:trusty/cinder-ceph"
     rabbitmq-server:
-      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
+      charm: "local:trusty/rabbitmq-server"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     keystone:
-      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
+      charm: "local:trusty/keystone"
       num_units: 1
       options:
         openstack-origin-git: include-file://keystone-master.yaml
@@ -102,7 +102,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     openstack-dashboard:
-      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
+      charm: "local:trusty/openstack-dashboard"
       num_units: 1
       options:
         openstack-origin-git: include-file://horizon-master.yaml
@@ -110,7 +110,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     nova-compute:
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      charm: local:trusty/nova-compute
       num_units: 2
       options:
         openstack-origin-git: include-file://nova-master.yaml
@@ -122,7 +122,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     nova-cloud-controller:
-      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
+      charm: "local:trusty/nova-cloud-controller"
       num_units: 1
       options:
         openstack-origin-git: include-file://nova-master.yaml
@@ -131,7 +131,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      charm: local:charms/trusty/neutron-api
       num_units: 1
       options:
         neutron-security-groups: True
@@ -139,7 +139,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
+      charm: "local:trusty/neutron-gateway"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
         instance-mtu: 1400
@@ -147,19 +147,19 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     glance:
-      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
+      charm: "local:trusty/glance"
       num_units: 1
       options:
         openstack-origin-git: include-file://glance-master.yaml
       to:
         - "lxc:nodes-api=0"
     opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      charm: local:trusty/promise
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     neutron-openvswitch:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
+      charm: "local:trusty/neutron-openvswitch"
       options:
         openstack-origin-git: include-file://neutron-master.yaml
   relations: