diff options
Diffstat (limited to 'ci/odl/juju-deployer/ovs-odl-ha.yaml')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 53 |
1 files changed, 4 insertions, 49 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 3705200b..95ec5745 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -426,12 +426,12 @@ openstack-phase2: - - "ceph-radosgw:identity-service" - "keystone:identity-service" -trusty-liberty-nodes: +trusty-mitaka-nodes: inherits: openstack-phase1 overrides: series: trusty -trusty-liberty: +trusty-mitaka: inherits: openstack-phase2 overrides: # cluster_count: 3 @@ -442,55 +442,10 @@ trusty-liberty: #l2-population: true #ext-port: "eth1" region: Canonical - source: "cloud:trusty-liberty" - openstack-origin: "cloud:trusty-liberty" + source: "cloud:trusty-mitaka" + openstack-origin: "cloud:trusty-mitaka" 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: -# cluster_count: 3 - #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: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-juno: - inherits: openstack-phase2 - overrides: -# cluster_count: 3 - #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-juno" - openstack-origin: "cloud:trusty-juno" - series: trusty - ceph-osd-replication-count: 2 - admin-role: admin - keystone-admin-role: admin |