aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-06-30 08:22:25 +0000
committerGerrit Code Review <review@openstack.org>2014-06-30 08:22:25 +0000
commit408c50dcab1656a69f4d756f037f854f0869c068 (patch)
treea376bb53f086b828e0ce3a80849dc0af08561b93
parent9e33760e06116fd44d9766b4b5828a29e69ec736 (diff)
parentf17d95f13394195a2df652bf97cb2408bc1fe327 (diff)
Merge "Haproxy configuration"
-rw-r--r--overcloud-source.yaml39
1 files changed, 39 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index e4439f0e..a5784f06 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -515,6 +515,45 @@ Resources:
ip: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
interface:
Ref: ControlVirtualInterface
+ haproxy:
+ nodes:
+ Merge::Map:
+ controller0:
+ ip: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
+ name: {"Fn::Select": [ name, {"Fn::GetAtt": [controller0, show]} ] }
+ net_binds:
+ - ip: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
+ services:
+ - name: keystone_admin
+ port: 35357
+ - name: keystone_public
+ port: 5000
+ - name: horizon
+ port: 80
+ - name: neutron
+ port: 9696
+ - name: cinder
+ port: 8776
+ - name: glance_api
+ port: 9292
+ - name: glance_registry
+ port: 9191
+ - name: heat_api
+ port: 8004
+ - name: heat_cloudwatch
+ port: 8003
+ - name: heat_cfn
+ port: 8000
+ - name: nova_ec2
+ port: 8773
+ - name: nova_osapi
+ port: 8774
+ - name: nova_metadata
+ port: 8775
+ - name: ceilometer
+ port: 8777
+ - name: swift_proxy_server
+ port: 8080
controllerPassthrough:
Type: OS::Heat::StructuredConfig
Properties: