summaryrefslogtreecommitdiffstats
path: root/ci/odl/juju-deployer/ovs-odl-nonha.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/odl/juju-deployer/ovs-odl-nonha.yaml')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml51
1 files changed, 4 insertions, 47 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 82c18beb..ee5ab664 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -263,56 +263,13 @@ openstack-phase2:
- "ceph:radosgw"
- - "ceph-radosgw:identity-service"
- "keystone:identity-service"
-trusty-liberty-nodes:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-trusty-liberty:
- inherits: openstack-phase2
- overrides:
- #os-data-network: 10.4.8.0/21
- #ceph-cluster-network: 10.4.0.0/21
- #prefer-ipv6: true
- #enable-dvr: true
- #l2-population: true
- #ext-port: "eth1"
- region: Canonical
- source: "cloud:trusty-liberty"
- openstack-origin: "cloud:trusty-liberty"
- series: trusty
- ceph-osd-replication-count: 2
- admin-role: admin
- keystone-admin-role: admin
-
-trusty-kilo-nodes:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-trusty-kilo:
- inherits: openstack-phase2
- overrides:
- #os-data-network: 10.4.8.0/21
- #ceph-cluster-network: 10.4.0.0/21
- #prefer-ipv6: true
- #enable-dvr: true
- #l2-population: true
- #ext-port: "eth1"
- region: Canonical
- source: "cloud:trusty-kilo"
- openstack-origin: "cloud:trusty-kilo"
- series: trusty
- ceph-osd-replication-count: 2
- admin-role: admin
- keystone-admin-role: admin
-trusty-juno-nodes:
+trusty-mitaka-nodes:
inherits: openstack-phase1
overrides:
series: trusty
-trusty-juno:
+trusty-mitaka:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
@@ -322,8 +279,8 @@ trusty-juno:
#l2-population: true
#ext-port: "eth1"
region: Canonical
- source: "cloud:trusty-juno"
- openstack-origin: "cloud:trusty-juno"
+ source: "cloud:trusty-mitaka"
+ openstack-origin: "cloud:trusty-mitaka"
series: trusty
ceph-osd-replication-count: 2
admin-role: admin