summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-29 12:49:49 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-29 12:50:26 -0500
commitd545ddc8b29d7d86ce160805449087ede0544b41 (patch)
tree0b6078182736cc0e28844905f955625b10674a5d
parente4ba668132c7958301ba399b839fa1ce43072a6f (diff)
modified the bundle to use the public end point if assigned.
Change-Id: I3bf11b14af61e8dc31589a130faad179d06e0c37 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/01-deploybundle.sh2
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml4
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml10
-rw-r--r--ci/onos/juju-deployer/ovs-onos-ha.yaml10
4 files changed, 14 insertions, 12 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 7748b005..08f539b5 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -66,6 +66,8 @@ if [ -e ~/.juju/deployment.yaml ]; then
sed --i "s@osd-devices: /srv@osd-devices: $cephdisk@g" ./bundles.yaml
osdomname=`grep "os-domain-name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
if [ "$osdomname" != "''" ]; then
+ sed --i "s@#use-internal-endpoints: true@use-internal-endpoints: true@g" ./bundles.yaml
+ sed --i "s@#endpoint-type: internalURL@endpoint-type: internalURL@g" ./bundles.yaml
sed --i "s@#os-public-hostname: pod.maas@os-public-hostname: api.$osdomname@g" ./bundles.yaml
sed --i "s@#console-proxy-ip: pod.maas@console-proxy-ip: $osdomname@g" ./bundles.yaml
fi
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 680441bb..4f0c0a21 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -13,7 +13,7 @@ trusty-mitaka-nodes:
#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:
@@ -68,7 +68,7 @@ openstack-phase1:
secret: admin
webroot: /
vip: 10.4.1.11
- endpoint-type: internalURL
+ #endpoint-type: internalURL
to:
- "lxc:nodes=3"
- "lxc:nodes=4"
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: /
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"