summaryrefslogtreecommitdiffstats
path: root/ci/odl/juju-deployer/ovs-odl-tip.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/odl/juju-deployer/ovs-odl-tip.yaml')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml40
1 files changed, 20 insertions, 20 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index baa6d6c6..8c309c54 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-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: 1
options:
osd-devices: /srv
@@ -67,7 +67,7 @@ openstack-phase2:
to:
- "nodes-compute=0"
ceph-radosgw:
- branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
+ charm: "local:trusty/ceph-radosgw"
num_units: 1
options:
use-embedded-webserver: true
@@ -75,7 +75,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
@@ -85,14 +85,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
@@ -101,7 +101,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
@@ -109,7 +109,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
@@ -121,7 +121,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
@@ -130,7 +130,7 @@ openstack-phase2:
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
@@ -138,7 +138,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
#ext-port: "eth1"
@@ -147,7 +147,7 @@ openstack-phase2:
to:
- "nodes-api=0"
odl-controller:
- branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
+ charm: local:trusty/odl-controller
options:
install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz"
profile: "openvswitch-odl-beryllium"
@@ -156,7 +156,7 @@ openstack-phase2:
to:
- "lxc: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
@@ -168,12 +168,12 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
neutron-api-odl:
- branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
+ charm: local:trusty/neutron-api-odl
options:
overlay-network-type: 'vxlan gre'
security-groups: True
openvswitch-odl:
- branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
+ charm: local:trusty/openvswitch-odl
relations:
- - "neutron-api:neutron-plugin-api-subordinate"
- "neutron-api-odl:neutron-plugin-api-subordinate"