diff options
Diffstat (limited to 'ci/odl/juju-deployer/ovs-odl-tip.yaml')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 8c309c54..28bb08d6 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -11,7 +11,7 @@ openstack-phase1: num_units: 2 constraints: tags=compute ntp: - charm: "cs:trusty/ntp" + charm: "local:trusty/ntp" relations: - - "ntp:juju-info" - "nodes-api:juju-info" @@ -36,7 +36,7 @@ openstack-phase2: ceilometer-agent: charm: "local:trusty/ceilometer-agent" mongodb: - charm: "cs:trusty/mongodb" + charm: "local:trusty/mongodb" num_units: 1 to: - "lxc:nodes-api=0" @@ -149,7 +149,7 @@ openstack-phase2: odl-controller: 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" + install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz" profile: "openvswitch-odl-beryllium" http-proxy: "http://squid.internal:3128" https-proxy: "http://squid.internal:3128" @@ -164,7 +164,6 @@ openstack-phase2: - "lxc:nodes-api=0" opnfv-promise: branch: lp:~narindergupta/charms/trusty/promise/trunk - num_units: 1 to: - "lxc:nodes-api=0" neutron-api-odl: @@ -281,7 +280,7 @@ trusty-mitaka: #l2-population: true #ext-port: "eth1" region: Canonical - source: "cloud:trusty-mitaka" + #source: "cloud:trusty-mitaka" openstack-origin: "cloud:trusty-mitaka" series: trusty ceph-osd-replication-count: 2 |