aboutsummaryrefslogtreecommitdiffstats
path: root/network/endpoints
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2016-01-15 16:31:36 -0600
committerBen Nemec <bnemec@redhat.com>2016-01-15 17:59:22 -0600
commitdd7602ad82100617126be26d80a6d3f67cb739ac (patch)
treeecc2b27aa3bee281fdd2feee4cbd17af30f08289 /network/endpoints
parentbdfdce52ad08d4ce70e7d4ca61b1c6d8409a8730 (diff)
Allow vncproxy to work with ssl enabled
Right now our vncproxy settings are hard-coded to http and the non-ssl port. This change adds a vncproxy entry to the endpoint map and uses those values to configure the proxy correctly on compute nodes. This is sufficient to get it working in my environment with ssl enabled. Change-Id: I9d69b088eef4700959b33c7e0eb44932949d7b71
Diffstat (limited to 'network/endpoints')
-rw-r--r--network/endpoints/endpoint_map.yaml28
1 files changed, 28 insertions, 0 deletions
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index f6063c0e..278c2605 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -74,6 +74,9 @@ parameters:
NovaEC2Admin: {protocol: 'http', port: '8773', host: 'IP_ADDRESS'}
NovaEC2Internal: {protocol: 'http', port: '8773', host: 'IP_ADDRESS'}
NovaEC2Public: {protocol: 'http', port: '8773', host: 'IP_ADDRESS'}
+ NovaVNCProxyAdmin: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
+ NovaVNCProxyInternal: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
+ NovaVNCProxyPublic: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
SwiftAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
SwiftPublic: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
@@ -364,6 +367,28 @@ resources:
CloudName: {get_param: CloudName}
UriSuffix: '/services/Admin'
+ NovaVNCProxyInternal:
+ type: OS::TripleO::Endpoint
+ properties:
+ EndpointName: NovaVNCProxyInternal
+ EndpointMap: { get_param: EndpointMap }
+ IP: {get_param: NovaApiVirtualIP}
+ CloudName: {get_param: CloudName}
+ NovaVNCProxyPublic:
+ type: OS::TripleO::Endpoint
+ properties:
+ EndpointName: NovaVNCProxyPublic
+ EndpointMap: { get_param: EndpointMap }
+ IP: {get_param: PublicVirtualIP}
+ CloudName: {get_param: CloudName}
+ NovaVNCProxyAdmin:
+ type: OS::TripleO::Endpoint
+ properties:
+ EndpointName: NovaVNCProxyAdmin
+ EndpointMap: { get_param: EndpointMap }
+ IP: {get_param: NovaApiVirtualIP}
+ CloudName: {get_param: CloudName}
+
SwiftInternal:
type: OS::TripleO::Endpoint
properties:
@@ -473,6 +498,9 @@ outputs:
NovaEC2Internal: {get_attr: [ NovaEC2Internal, endpoint] }
NovaEC2Public: {get_attr: [ NovaEC2Public, endpoint] }
NovaEC2Admin: {get_attr: [ NovaEC2Admin, endpoint] }
+ NovaVNCProxyInternal: {get_attr: [ NovaVNCProxyInternal, endpoint] }
+ NovaVNCProxyPublic: {get_attr: [ NovaVNCProxyPublic, endpoint] }
+ NovaVNCProxyAdmin: {get_attr: [ NovaVNCProxyAdmin, endpoint] }
SwiftInternal: {get_attr: [ SwiftInternal, endpoint] }
SwiftPublic: {get_attr: [ SwiftPublic, endpoint] }
SwiftAdmin: {get_attr: [ SwiftAdmin, endpoint] }