aboutsummaryrefslogtreecommitdiffstats
path: root/network/endpoints
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-24 09:32:46 +0000
committerGerrit Code Review <review@openstack.org>2016-02-24 09:32:47 +0000
commit949b6d1cc247a66869c627a504436f1642481667 (patch)
treefff84f9edc4556d62434e18d254920a5951c7848 /network/endpoints
parentef73827d736124bf609b0c06ee6d0d05353bd596 (diff)
parentdd7602ad82100617126be26d80a6d3f67cb739ac (diff)
Merge "Allow vncproxy to work with ssl enabled"
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 096ee558..f7f7dfb4 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] }