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

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

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 7f79b6a..33b1300 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -21,14 +21,14 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      charm: "local:charms/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"
     ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
+      charm: "local:trusty/ceph"
       num_units: 2
       options:
         monitor-count: 2
@@ -42,7 +42,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
@@ -51,7 +51,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
@@ -59,7 +59,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
@@ -68,22 +68,22 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
+      charm: "local:trusty/cinder-ceph"
       num_units: 0
     glance:
-      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
+      charm: "local:trusty/glance"
       num_units: 1
       options:
         ha-mcastport: 5402
       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"
     keystone:
-      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
+      charm: "local:trusty/keystone"
       num_units: 1
       options:
         admin-password: openstack
@@ -97,14 +97,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     mysql:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+      charm: "local:trusty/percona-cluster"
       num_units: 1
       options:
         max-connections: 20000
       to:
         - "lxc:nodes-api=0"
     neutron-api:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next"
+      charm: "local:trusty/neutron-api"
       num_units: 1
       options:
         neutron-security-groups: true
@@ -113,7 +113,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
+      charm: "local:trusty/neutron-gateway"
       num_units: 1
       options:
         instance-mtu: 1400
@@ -121,17 +121,17 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     neutron-openvswitch:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
+      charm: "local:trusty/neutron-openvswitch"
       num_units: 0
     nova-cloud-controller:
-      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
+      charm: "local:trusty/nova-cloud-controller"
       num_units: 1
       options:
         network-manager: Neutron
       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:
         enable-live-migration: true
@@ -145,7 +145,7 @@ openstack-phase2:
 #        - "nodes-api=1"
 #        - "nodes-api=2"
     openstack-dashboard:
-      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
+      charm: "local:trusty/openstack-dashboard"
       num_units: 1
       options:
         secret: admin
@@ -153,12 +153,12 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     rabbitmq-server:
-      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
+      charm: "local:trusty/rabbitmq-server"
       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"
   relations: