From d545ddc8b29d7d86ce160805449087ede0544b41 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 29 Jun 2016 12:49:49 -0500 Subject: modified the bundle to use the public end point if assigned. Change-Id: I3bf11b14af61e8dc31589a130faad179d06e0c37 Signed-off-by: Narinder Gupta --- ci/onos/juju-deployer/ovs-onos-ha.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ci/onos/juju-deployer') diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index aab64eaf..8a3ba240 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-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: @@ -126,7 +126,7 @@ openstack-phase1: secret: admin vip: 10.4.1.11 webroot: / - endpoint-type: internalURL + #endpoint-type: internalURL to: - "lxc:nodes=2" - "lxc:nodes=3" -- cgit 1.2.3-korg