summaryrefslogtreecommitdiffstats
path: root/ci/onos/juju-deployer
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-28 22:33:01 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-28 22:35:39 -0500
commit403471e3dae07ac8a791006d1edcd4d885d17bf2 (patch)
tree4a1b9b363078c0693a11779bde0823fbb0a8ffb1 /ci/onos/juju-deployer
parent9f2d0ae85f6439841c18d694064a70a2340a4b80 (diff)
modified to fix the internal Admin URL issue in ODL.
Change-Id: I83955f135a6288d396e68be30909078c81cb7141 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/onos/juju-deployer')
-rw-r--r--ci/onos/juju-deployer/ovs-onos-ha.yaml60
1 files changed, 32 insertions, 28 deletions
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 06cb5019..aab64eaf 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -16,6 +16,8 @@ trusty-mitaka:
#ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
+ use-internal-endpoints: true
+ #os-public-hostname: pod.maas
openstack-phase1:
services:
@@ -24,34 +26,6 @@ openstack-phase1:
num_units: 5
ntp:
charm: "local:trusty/ntp"
- hacluster-keystone:
- charm: "local:trusty/hacluster"
- options:
- corosync_transport: unicast
- hacluster-horizon:
- charm: "local:trusty/hacluster"
- options:
- corosync_transport: unicast
- hacluster-nova:
- charm: "local:trusty/hacluster"
- options:
- corosync_transport: unicast
- hacluster-neutron:
- charm: "local:trusty/hacluster"
- options:
- corosync_transport: unicast
- hacluster-glance:
- charm: "local:trusty/hacluster"
- options:
- corosync_transport: unicast
- hacluster-ceilometer:
- charm: "local:trusty/hacluster"
- options:
- corosync_transport: unicast
- hacluster-mysql:
- charm: "local:trusty/hacluster"
- options:
- corosync_transport: unicast
mysql:
charm: "local:trusty/percona-cluster"
num_units: 3
@@ -152,6 +126,7 @@ openstack-phase1:
secret: admin
vip: 10.4.1.11
webroot: /
+ endpoint-type: internalURL
to:
- "lxc:nodes=2"
- "lxc:nodes=3"
@@ -178,6 +153,7 @@ openstack-phase1:
console-access-protocol: novnc
network-manager: Neutron
#service-guard: true
+ #console-proxy-ip: pod.maas
vip: 10.4.1.16
to:
- "lxc:nodes=3"
@@ -229,6 +205,34 @@ openstack-phase1:
#source-branch: stable/mitaka
to:
- "lxc:nodes=0"
+ hacluster-keystone:
+ charm: "local:trusty/hacluster"
+ options:
+ corosync_transport: unicast
+ hacluster-horizon:
+ charm: "local:trusty/hacluster"
+ options:
+ corosync_transport: unicast
+ hacluster-nova:
+ charm: "local:trusty/hacluster"
+ options:
+ corosync_transport: unicast
+ hacluster-neutron:
+ charm: "local:trusty/hacluster"
+ options:
+ corosync_transport: unicast
+ hacluster-glance:
+ charm: "local:trusty/hacluster"
+ options:
+ corosync_transport: unicast
+ hacluster-ceilometer:
+ charm: "local:trusty/hacluster"
+ options:
+ corosync_transport: unicast
+ hacluster-mysql:
+ charm: "local:trusty/hacluster"
+ options:
+ corosync_transport: unicast
relations:
- - "ntp:juju-info"
- "nodes:juju-info"