summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-03-24 12:31:28 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-03-24 12:32:10 -0500
commit233e251b4d192236224b612d96e1a2aa4696b5f5 (patch)
tree44d5a0a32627f22247fb368d377b6b4bbe7c7da9 /ci
parent162c2850c778699c893e37228bd8101a62bda975 (diff)
modified to be include heat as HA and replace the public endpoint
Change-Id: Ia2d750b96b3fe1c12b4593286a0514530f319da3
Diffstat (limited to 'ci')
-rwxr-xr-xci/01-deploybundle.sh2
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml2
2 files changed, 4 insertions, 0 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index f65c4dca..aac6610b 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -27,6 +27,8 @@ case "$3" in
sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
+ # Use host for public API for Orange pod2
+ sed -i -- 's/#os-public-hostname: api.public-fqdn/os-public-hostname: api.pod2.opnfv.fr/g' ./bundles.yaml
;;
'intelpod6' )
# As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index a2438304..d945fdd7 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -333,6 +333,8 @@ openstack-phase2:
- "hacluster-horizon:ha"
- - "ceilometer:ha"
- "hacluster-ceilometer:ha"
+ - - "heat:ha"
+ - "hacluster-heat:ha"
- - "neutron-api:neutron-plugin-api-subordinate"
- "neutron-api-odl:neutron-plugin-api-subordinate"
- - "nova-compute:neutron-plugin"