Merge "Add hieradata for Manila v1 and v2 endpoints"
This commit is contained in:
commit
05691d2508
@ -141,14 +141,17 @@ Manila:
|
|||||||
vip_param: ManilaApi
|
vip_param: ManilaApi
|
||||||
uri_suffixes:
|
uri_suffixes:
|
||||||
'': /v2/%(tenant_id)s
|
'': /v2/%(tenant_id)s
|
||||||
|
V1: /v1/%(tenant_id)s
|
||||||
Public:
|
Public:
|
||||||
vip_param: Public
|
vip_param: Public
|
||||||
uri_suffixes:
|
uri_suffixes:
|
||||||
'': /v2/%(tenant_id)s
|
'': /v2/%(tenant_id)s
|
||||||
|
V1: /v1/%(tenant_id)s
|
||||||
Admin:
|
Admin:
|
||||||
vip_param: ManilaApi
|
vip_param: ManilaApi
|
||||||
uri_suffixes:
|
uri_suffixes:
|
||||||
'': /v2/%(tenant_id)s
|
'': /v2/%(tenant_id)s
|
||||||
|
V1: /v1/%(tenant_id)s
|
||||||
port: 8786
|
port: 8786
|
||||||
|
|
||||||
Neutron:
|
Neutron:
|
||||||
|
@ -1711,6 +1711,123 @@ outputs:
|
|||||||
IP_ADDRESS: {get_param: PublicVirtualIP}
|
IP_ADDRESS: {get_param: PublicVirtualIP}
|
||||||
- ':'
|
- ':'
|
||||||
- get_param: [EndpointMap, ManilaPublic, port]
|
- get_param: [EndpointMap, ManilaPublic, port]
|
||||||
|
ManilaV1Admin:
|
||||||
|
host:
|
||||||
|
str_replace:
|
||||||
|
template:
|
||||||
|
get_param: [EndpointMap, ManilaAdmin, host]
|
||||||
|
params:
|
||||||
|
CLOUDNAME: {get_param: CloudName}
|
||||||
|
IP_ADDRESS: {get_param: ManilaApiVirtualIP}
|
||||||
|
port:
|
||||||
|
get_param: [EndpointMap, ManilaAdmin, port]
|
||||||
|
protocol:
|
||||||
|
get_param: [EndpointMap, ManilaAdmin, protocol]
|
||||||
|
uri:
|
||||||
|
list_join:
|
||||||
|
- ''
|
||||||
|
- - get_param: [EndpointMap, ManilaAdmin, protocol]
|
||||||
|
- ://
|
||||||
|
- str_replace:
|
||||||
|
template:
|
||||||
|
get_param: [EndpointMap, ManilaAdmin, host]
|
||||||
|
params:
|
||||||
|
CLOUDNAME: {get_param: CloudName}
|
||||||
|
IP_ADDRESS: {get_param: ManilaApiVirtualIP}
|
||||||
|
- ':'
|
||||||
|
- get_param: [EndpointMap, ManilaAdmin, port]
|
||||||
|
- /v1/%(tenant_id)s
|
||||||
|
uri_no_suffix:
|
||||||
|
list_join:
|
||||||
|
- ''
|
||||||
|
- - get_param: [EndpointMap, ManilaAdmin, protocol]
|
||||||
|
- ://
|
||||||
|
- str_replace:
|
||||||
|
template:
|
||||||
|
get_param: [EndpointMap, ManilaAdmin, host]
|
||||||
|
params:
|
||||||
|
CLOUDNAME: {get_param: CloudName}
|
||||||
|
IP_ADDRESS: {get_param: ManilaApiVirtualIP}
|
||||||
|
- ':'
|
||||||
|
- get_param: [EndpointMap, ManilaAdmin, port]
|
||||||
|
ManilaV1Internal:
|
||||||
|
host:
|
||||||
|
str_replace:
|
||||||
|
template:
|
||||||
|
get_param: [EndpointMap, ManilaInternal, host]
|
||||||
|
params:
|
||||||
|
CLOUDNAME: {get_param: CloudName}
|
||||||
|
IP_ADDRESS: {get_param: ManilaApiVirtualIP}
|
||||||
|
port:
|
||||||
|
get_param: [EndpointMap, ManilaInternal, port]
|
||||||
|
protocol:
|
||||||
|
get_param: [EndpointMap, ManilaInternal, protocol]
|
||||||
|
uri:
|
||||||
|
list_join:
|
||||||
|
- ''
|
||||||
|
- - get_param: [EndpointMap, ManilaInternal, protocol]
|
||||||
|
- ://
|
||||||
|
- str_replace:
|
||||||
|
template:
|
||||||
|
get_param: [EndpointMap, ManilaInternal, host]
|
||||||
|
params:
|
||||||
|
CLOUDNAME: {get_param: CloudName}
|
||||||
|
IP_ADDRESS: {get_param: ManilaApiVirtualIP}
|
||||||
|
- ':'
|
||||||
|
- get_param: [EndpointMap, ManilaInternal, port]
|
||||||
|
- /v1/%(tenant_id)s
|
||||||
|
uri_no_suffix:
|
||||||
|
list_join:
|
||||||
|
- ''
|
||||||
|
- - get_param: [EndpointMap, ManilaInternal, protocol]
|
||||||
|
- ://
|
||||||
|
- str_replace:
|
||||||
|
template:
|
||||||
|
get_param: [EndpointMap, ManilaInternal, host]
|
||||||
|
params:
|
||||||
|
CLOUDNAME: {get_param: CloudName}
|
||||||
|
IP_ADDRESS: {get_param: ManilaApiVirtualIP}
|
||||||
|
- ':'
|
||||||
|
- get_param: [EndpointMap, ManilaInternal, port]
|
||||||
|
ManilaV1Public:
|
||||||
|
host:
|
||||||
|
str_replace:
|
||||||
|
template:
|
||||||
|
get_param: [EndpointMap, ManilaPublic, host]
|
||||||
|
params:
|
||||||
|
CLOUDNAME: {get_param: CloudName}
|
||||||
|
IP_ADDRESS: {get_param: PublicVirtualIP}
|
||||||
|
port:
|
||||||
|
get_param: [EndpointMap, ManilaPublic, port]
|
||||||
|
protocol:
|
||||||
|
get_param: [EndpointMap, ManilaPublic, protocol]
|
||||||
|
uri:
|
||||||
|
list_join:
|
||||||
|
- ''
|
||||||
|
- - get_param: [EndpointMap, ManilaPublic, protocol]
|
||||||
|
- ://
|
||||||
|
- str_replace:
|
||||||
|
template:
|
||||||
|
get_param: [EndpointMap, ManilaPublic, host]
|
||||||
|
params:
|
||||||
|
CLOUDNAME: {get_param: CloudName}
|
||||||
|
IP_ADDRESS: {get_param: PublicVirtualIP}
|
||||||
|
- ':'
|
||||||
|
- get_param: [EndpointMap, ManilaPublic, port]
|
||||||
|
- /v1/%(tenant_id)s
|
||||||
|
uri_no_suffix:
|
||||||
|
list_join:
|
||||||
|
- ''
|
||||||
|
- - get_param: [EndpointMap, ManilaPublic, protocol]
|
||||||
|
- ://
|
||||||
|
- str_replace:
|
||||||
|
template:
|
||||||
|
get_param: [EndpointMap, ManilaPublic, host]
|
||||||
|
params:
|
||||||
|
CLOUDNAME: {get_param: CloudName}
|
||||||
|
IP_ADDRESS: {get_param: PublicVirtualIP}
|
||||||
|
- ':'
|
||||||
|
- get_param: [EndpointMap, ManilaPublic, port]
|
||||||
MysqlInternal:
|
MysqlInternal:
|
||||||
host:
|
host:
|
||||||
str_replace:
|
str_replace:
|
||||||
|
@ -35,9 +35,12 @@ outputs:
|
|||||||
- manila::api::keystone_password: {get_param: ManilaPassword}
|
- manila::api::keystone_password: {get_param: ManilaPassword}
|
||||||
manila::api::keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
manila::api::keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
||||||
manila::api::keystone_auth_host: {get_param: [EndpointMap, ManilaInternal, host]}
|
manila::api::keystone_auth_host: {get_param: [EndpointMap, ManilaInternal, host]}
|
||||||
manila::keystone::auth::public_url: {get_param: [EndpointMap, ManilaPublic, uri]}
|
manila::keystone::auth::public_url: {get_param: [EndpointMap, ManilaV1Public, uri]}
|
||||||
manila::keystone::auth::internal_url: {get_param: [EndpointMap, ManilaInternal, uri]}
|
manila::keystone::auth::internal_url: {get_param: [EndpointMap, ManilaV1Internal, uri]}
|
||||||
manila::keystone::auth::admin_url: {get_param: [EndpointMap, ManilaAdmin, uri]}
|
manila::keystone::auth::admin_url: {get_param: [EndpointMap, ManilaV1Admin, uri]}
|
||||||
|
manila::keystone::auth::public_url_v2: {get_param: [EndpointMap, ManilaPublic, uri]}
|
||||||
|
manila::keystone::auth::internal_url_v2: {get_param: [EndpointMap, ManilaInternal, uri]}
|
||||||
|
manila::keystone::auth::admin_url_v2: {get_param: [EndpointMap, ManilaAdmin, uri]}
|
||||||
manila::keystone::auth::password: {get_param: ManilaPassword }
|
manila::keystone::auth::password: {get_param: ManilaPassword }
|
||||||
manila::keystone::auth::region: {get_param: KeystoneRegion }
|
manila::keystone::auth::region: {get_param: KeystoneRegion }
|
||||||
manila::api::keystone_tenant: 'service'
|
manila::api::keystone_tenant: 'service'
|
||||||
|
Loading…
Reference in New Issue
Block a user