diff options
Diffstat (limited to 'ci/odl/juju-deployer/ovs-odl-ha.yaml')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 80dc8553..96f9365f 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -1,9 +1,6 @@ # vim: set ts=2 et: trusty-mitaka-nodes: inherits: openstack-phase1 - -trusty-mitaka: - inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 #ceph-cluster-network: 10.4.0.0/21 @@ -16,9 +13,12 @@ trusty-mitaka: #ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin - use-internal-endpoints: true + #use-internal-endpoints: true #os-public-hostname: pod.maas +trusty-mitaka: + inherits: openstack-phase2 + openstack-phase1: services: nodes: @@ -137,7 +137,7 @@ openstack-phase1: charm: local:trusty/openstack-dashboard num_units: 3 options: - endpoint-type: internalURL + #endpoint-type: internalURL secret: admin vip: 10.4.1.11 webroot: / |