Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix service config files having wrong map_merge format"
[apex-tripleo-heat-templates.git]
/
network
/
endpoints
/
endpoint_data.yaml
diff --git
a/network/endpoints/endpoint_data.yaml
b/network/endpoints/endpoint_data.yaml
index
40b26f2
..
84b03c7
100644
(file)
--- a/
network/endpoints/endpoint_data.yaml
+++ b/
network/endpoints/endpoint_data.yaml
@@
-3,100
+3,105
@@
Aodh:
Internal:
Aodh:
Internal:
-
vip
_param: AodhApi
+
net
_param: AodhApi
Public:
Public:
-
vip
_param: Public
+
net
_param: Public
Admin:
Admin:
-
vip
_param: AodhApi
+
net
_param: AodhApi
port: 8042
Ceilometer:
Internal:
port: 8042
Ceilometer:
Internal:
-
vip
_param: CeilometerApi
+
net
_param: CeilometerApi
Public:
Public:
-
vip
_param: Public
+
net
_param: Public
Admin:
Admin:
-
vip
_param: CeilometerApi
+
net
_param: CeilometerApi
port: 8777
Gnocchi:
Internal:
port: 8777
Gnocchi:
Internal:
-
vip
_param: GnocchiApi
+
net
_param: GnocchiApi
Public:
Public:
-
vip
_param: Public
+
net
_param: Public
Admin:
Admin:
-
vip
_param: GnocchiApi
+
net
_param: GnocchiApi
port: 8041
Cinder:
Internal:
port: 8041
Cinder:
Internal:
-
vip
_param: CinderApi
+
net
_param: CinderApi
uri_suffixes:
'': /v1/%(tenant_id)s
V2: /v2/%(tenant_id)s
uri_suffixes:
'': /v1/%(tenant_id)s
V2: /v2/%(tenant_id)s
+ V3: /v3/%(tenant_id)s
Public:
Public:
-
vip
_param: Public
+
net
_param: Public
uri_suffixes:
'': /v1/%(tenant_id)s
V2: /v2/%(tenant_id)s
uri_suffixes:
'': /v1/%(tenant_id)s
V2: /v2/%(tenant_id)s
+ V3: /v3/%(tenant_id)s
Admin:
Admin:
-
vip
_param: CinderApi
+
net
_param: CinderApi
uri_suffixes:
'': /v1/%(tenant_id)s
V2: /v2/%(tenant_id)s
uri_suffixes:
'': /v1/%(tenant_id)s
V2: /v2/%(tenant_id)s
+ V3: /v3/%(tenant_id)s
port: 8776
Glance:
Internal:
port: 8776
Glance:
Internal:
-
vip
_param: GlanceApi
+
net
_param: GlanceApi
Public:
Public:
-
vip
_param: Public
+
net
_param: Public
Admin:
Admin:
-
vip
_param: GlanceApi
+
net
_param: GlanceApi
port: 9292
GlanceRegistry:
Internal:
port: 9292
GlanceRegistry:
Internal:
-
vip
_param: GlanceRegistry
+
net
_param: GlanceRegistry
port: 9191
Mysql:
port: 9191
Mysql:
- '':
- vip_param: Mysql
+ Internal:
+ net_param: Mysql
+ protocol: mysql+pymysql
+ port: 3306
Heat:
Internal:
Heat:
Internal:
-
vip
_param: HeatApi
+
net
_param: HeatApi
uri_suffixes:
'': /v1/%(tenant_id)s
Public:
uri_suffixes:
'': /v1/%(tenant_id)s
Public:
-
vip
_param: Public
+
net
_param: Public
uri_suffixes:
'': /v1/%(tenant_id)s
Admin:
uri_suffixes:
'': /v1/%(tenant_id)s
Admin:
-
vip
_param: HeatApi
+
net
_param: HeatApi
uri_suffixes:
'': /v1/%(tenant_id)s
port: 8004
HeatCfn:
Internal:
uri_suffixes:
'': /v1/%(tenant_id)s
port: 8004
HeatCfn:
Internal:
-
vip
_param: HeatApi
+
net
_param: HeatApi
uri_suffixes:
'': /v1
Public:
uri_suffixes:
'': /v1
Public:
-
vip
_param: Public
+
net
_param: Public
uri_suffixes:
'': /v1
Admin:
uri_suffixes:
'': /v1
Admin:
-
vip
_param: HeatApi
+
net
_param: HeatApi
uri_suffixes:
'': /v1
port: 8000
Horizon:
Public:
uri_suffixes:
'': /v1
port: 8000
Horizon:
Public:
-
vip
_param: Public
+
net
_param: Public
uri_suffixes:
'': /dashboard
port: 80
uri_suffixes:
'': /dashboard
port: 80
@@
-105,7
+110,7
@@
Horizon:
# Required for https://bugs.launchpad.net/puppet-nova/+bug/1542486
Keystone:
Internal:
# Required for https://bugs.launchpad.net/puppet-nova/+bug/1542486
Keystone:
Internal:
-
vip
_param: KeystonePublicApi
+
net
_param: KeystonePublicApi
uri_suffixes:
'': /v2.0
EC2: /v2.0/ec2tokens
uri_suffixes:
'': /v2.0
EC2: /v2.0/ec2tokens
@@
-113,64
+118,82
@@
Keystone:
names:
EC2: KeystoneEC2
Public:
names:
EC2: KeystoneEC2
Public:
-
vip
_param: Public
+
net
_param: Public
uri_suffixes:
'': /v2.0
V3: /v3
Admin:
uri_suffixes:
'': /v2.0
V3: /v3
Admin:
-
vip
_param: KeystoneAdminApi
+
net
_param: KeystoneAdminApi
uri_suffixes:
'': /v2.0
V3: /v3
port: 35357
port: 5000
uri_suffixes:
'': /v2.0
V3: /v3
port: 35357
port: 5000
+Manila:
+ Internal:
+ net_param: ManilaApi
+ uri_suffixes:
+ '': /v2/%(tenant_id)s
+ V1: /v1/%(tenant_id)s
+ Public:
+ net_param: Public
+ uri_suffixes:
+ '': /v2/%(tenant_id)s
+ V1: /v1/%(tenant_id)s
+ Admin:
+ net_param: ManilaApi
+ uri_suffixes:
+ '': /v2/%(tenant_id)s
+ V1: /v1/%(tenant_id)s
+ port: 8786
+
Neutron:
Internal:
Neutron:
Internal:
-
vip
_param: NeutronApi
+
net
_param: NeutronApi
Public:
Public:
-
vip
_param: Public
+
net
_param: Public
Admin:
Admin:
-
vip
_param: NeutronApi
+
net
_param: NeutronApi
port: 9696
Nova:
Internal:
port: 9696
Nova:
Internal:
-
vip
_param: NovaApi
+
net
_param: NovaApi
uri_suffixes:
uri_suffixes:
- '': /v2.1
/%(tenant_id)s
+ '': /v2.1
Public:
Public:
-
vip
_param: Public
+
net
_param: Public
uri_suffixes:
uri_suffixes:
- '': /v2.1
/%(tenant_id)s
+ '': /v2.1
Admin:
Admin:
-
vip
_param: NovaApi
+
net
_param: NovaApi
uri_suffixes:
uri_suffixes:
- '': /v2.1
/%(tenant_id)s
+ '': /v2.1
port: 8774
NovaVNCProxy:
Internal:
port: 8774
NovaVNCProxy:
Internal:
-
vip
_param: NovaApi
+
net
_param: NovaApi
Public:
Public:
-
vip
_param: Public
+
net
_param: Public
Admin:
Admin:
-
vip
_param: NovaApi
+
net
_param: NovaApi
port: 6080
Swift:
Internal:
port: 6080
Swift:
Internal:
-
vip
_param: SwiftProxy
+
net
_param: SwiftProxy
uri_suffixes:
'': /v1/AUTH_%(tenant_id)s
S3:
Public:
uri_suffixes:
'': /v1/AUTH_%(tenant_id)s
S3:
Public:
-
vip
_param: Public
+
net
_param: Public
uri_suffixes:
'': /v1/AUTH_%(tenant_id)s
S3:
Admin:
uri_suffixes:
'': /v1/AUTH_%(tenant_id)s
S3:
Admin:
-
vip
_param: SwiftProxy
+
net
_param: SwiftProxy
uri_suffixes:
'':
S3:
uri_suffixes:
'':
S3:
@@
-178,15
+201,30
@@
Swift:
Sahara:
Internal:
Sahara:
Internal:
-
vip
_param: SaharaApi
+
net
_param: SaharaApi
uri_suffixes:
'': /v1.1/%(tenant_id)s
Public:
uri_suffixes:
'': /v1.1/%(tenant_id)s
Public:
-
vip
_param: Public
+
net
_param: Public
uri_suffixes:
'': /v1.1/%(tenant_id)s
Admin:
uri_suffixes:
'': /v1.1/%(tenant_id)s
Admin:
-
vip
_param: SaharaApi
+
net
_param: SaharaApi
uri_suffixes:
'': /v1.1/%(tenant_id)s
port: 8386
uri_suffixes:
'': /v1.1/%(tenant_id)s
port: 8386
+
+Ironic:
+ Internal:
+ net_param: IronicApi
+ uri_suffixes:
+ '': /v1
+ Public:
+ net_param: Public
+ uri_suffixes:
+ '': /v1
+ Admin:
+ net_param: IronicApi
+ uri_suffixes:
+ '': /v1
+ port: 6385