Merge "Pass storage nfs VIP to ceph-ansible"
This commit is contained in:
commit
067b8ce6ca
docker/services/ceph-ansible
environments
network/endpoints
releasenotes/notes
sample-env-generator
@ -60,14 +60,12 @@ outputs:
|
||||
- tripleo.ceph_nfs.firewall_rules:
|
||||
'120 ceph_nfs':
|
||||
dport:
|
||||
# FIXME
|
||||
# We support only NFS 4.1 to start
|
||||
- 2049
|
||||
- 20048
|
||||
- 38468
|
||||
- 4501
|
||||
- ceph_nfs_ansible_vars:
|
||||
map_merge:
|
||||
- {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
|
||||
- ceph_nfs_bind_addr: {get_param: [EndpointMap, GaneshaInternal, host]}
|
||||
- ceph_nfs_enable_service: false
|
||||
- ceph_nfs_use_pacemaker: true
|
||||
- ceph_nfs_dynamic_exports: true
|
||||
|
@ -34,6 +34,7 @@ parameter_defaults:
|
||||
Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}
|
||||
GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'IP_ADDRESS'}
|
||||
GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}
|
||||
|
@ -34,6 +34,7 @@ parameter_defaults:
|
||||
Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'IP_ADDRESS'}
|
||||
GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'IP_ADDRESS'}
|
||||
GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlancePublic: {protocol: 'https', port: '13292', host: 'IP_ADDRESS'}
|
||||
|
@ -34,6 +34,7 @@ parameter_defaults:
|
||||
Ec2ApiAdmin: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
|
||||
Ec2ApiInternal: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
|
||||
Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}
|
||||
GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'CLOUDNAME'}
|
||||
GlanceAdmin: {protocol: 'https', port: '9292', host: 'CLOUDNAME'}
|
||||
GlanceInternal: {protocol: 'https', port: '9292', host: 'CLOUDNAME'}
|
||||
GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}
|
||||
|
@ -28,6 +28,7 @@ parameter_defaults:
|
||||
Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}
|
||||
GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'IP_ADDRESS'}
|
||||
GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}
|
||||
|
@ -28,6 +28,7 @@ parameter_defaults:
|
||||
Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'IP_ADDRESS'}
|
||||
GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'IP_ADDRESS'}
|
||||
GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlancePublic: {protocol: 'https', port: '13292', host: 'IP_ADDRESS'}
|
||||
|
@ -24,6 +24,7 @@ parameter_defaults:
|
||||
Ec2ApiAdmin: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
|
||||
Ec2ApiInternal: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
|
||||
Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}
|
||||
GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'CLOUDNAME'}
|
||||
GlanceAdmin: {protocol: 'https', port: '9292', host: 'CLOUDNAME'}
|
||||
GlanceInternal: {protocol: 'https', port: '9292', host: 'CLOUDNAME'}
|
||||
GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}
|
||||
|
@ -350,6 +350,12 @@ Octavia:
|
||||
net_param: OctaviaApi
|
||||
port: 9876
|
||||
|
||||
Ganesha:
|
||||
Internal:
|
||||
net_param: Ganesha
|
||||
protocol: nfs
|
||||
port: 2049
|
||||
|
||||
DockerRegistry:
|
||||
Internal:
|
||||
net_param: DockerRegistry
|
||||
|
@ -41,6 +41,7 @@ parameters:
|
||||
Ec2ApiAdmin: {protocol: http, port: '8788', host: IP_ADDRESS}
|
||||
Ec2ApiInternal: {protocol: http, port: '8788', host: IP_ADDRESS}
|
||||
Ec2ApiPublic: {protocol: http, port: '8788', host: IP_ADDRESS}
|
||||
GaneshaInternal: {protocol: nfs, port: '2049', host: IP_ADDRESS}
|
||||
GlanceAdmin: {protocol: http, port: '9292', host: IP_ADDRESS}
|
||||
GlanceInternal: {protocol: http, port: '9292', host: IP_ADDRESS}
|
||||
GlancePublic: {protocol: http, port: '9292', host: IP_ADDRESS}
|
||||
@ -2422,6 +2423,87 @@ outputs:
|
||||
template: NETWORK_uri
|
||||
port:
|
||||
get_param: [EndpointMap, Ec2ApiPublic, port]
|
||||
GaneshaInternal:
|
||||
host:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, GaneshaInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, GaneshaNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, GaneshaNetwork]
|
||||
template: NETWORK_uri
|
||||
host_nobrackets:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, GaneshaInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, GaneshaNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- get_param: [ServiceNetMap, GaneshaNetwork]
|
||||
port:
|
||||
get_param: [EndpointMap, GaneshaInternal, port]
|
||||
protocol:
|
||||
get_param: [EndpointMap, GaneshaInternal, protocol]
|
||||
uri:
|
||||
make_url:
|
||||
scheme:
|
||||
get_param: [EndpointMap, GaneshaInternal, protocol]
|
||||
host:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, GaneshaInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, GaneshaNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, GaneshaNetwork]
|
||||
template: NETWORK_uri
|
||||
port:
|
||||
get_param: [EndpointMap, GaneshaInternal, port]
|
||||
uri_no_suffix:
|
||||
make_url:
|
||||
scheme:
|
||||
get_param: [EndpointMap, GaneshaInternal, protocol]
|
||||
host:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, GaneshaInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, GaneshaNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, GaneshaNetwork]
|
||||
template: NETWORK_uri
|
||||
port:
|
||||
get_param: [EndpointMap, GaneshaInternal, port]
|
||||
GlanceAdmin:
|
||||
host:
|
||||
str_replace:
|
||||
|
@ -0,0 +1,7 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Manila now supports the CephNFS back end. Deploy using the
|
||||
ControllerStorageNFS role and '-n network_data_ganesha.yaml',
|
||||
along with manila-cephfsganesha-config-docker.yaml.
|
||||
|
@ -129,6 +129,7 @@ environments:
|
||||
Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'IP_ADDRESS'}
|
||||
GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'IP_ADDRESS'}
|
||||
GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlancePublic: {protocol: 'https', port: '13292', host: 'IP_ADDRESS'}
|
||||
@ -233,6 +234,7 @@ environments:
|
||||
Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
|
||||
Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}
|
||||
GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'IP_ADDRESS'}
|
||||
GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||
GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}
|
||||
@ -337,6 +339,7 @@ environments:
|
||||
Ec2ApiAdmin: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
|
||||
Ec2ApiInternal: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
|
||||
Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}
|
||||
GaneshaInternal: {protocol: 'nfs', port: '2049', host: 'CLOUDNAME'}
|
||||
GlanceAdmin: {protocol: 'https', port: '9292', host: 'CLOUDNAME'}
|
||||
GlanceInternal: {protocol: 'https', port: '9292', host: 'CLOUDNAME'}
|
||||
GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}
|
||||
|
Loading…
x
Reference in New Issue
Block a user