Merge "Add support for deploying Ceph RGW role"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
8fb5d99714
5
environments/ceph-radosgw.yaml
Normal file
5
environments/ceph-radosgw.yaml
Normal file
@ -0,0 +1,5 @@
|
||||
resource_registry:
|
||||
OS::TripleO::Services::CephRgw: ../puppet/services/ceph-rgw.yaml
|
||||
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||
@ -8,6 +8,9 @@ parameter_defaults:
|
||||
CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
|
||||
CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
|
||||
CeilometerPublic: {protocol: 'https', port: '13777', host: 'CLOUDNAME'}
|
||||
CephRgwAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||
CephRgwInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||
CephRgwPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
|
||||
CinderAdmin: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
|
||||
CinderInternal: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
|
||||
CinderPublic: {protocol: 'https', port: '13776', host: 'CLOUDNAME'}
|
||||
|
||||
@ -8,6 +8,9 @@ parameter_defaults:
|
||||
CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
|
||||
CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
|
||||
CeilometerPublic: {protocol: 'https', port: '13777', host: 'IP_ADDRESS'}
|
||||
CephRgwAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||
CephRgwInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||
CephRgwPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'}
|
||||
CinderAdmin: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
|
||||
CinderInternal: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
|
||||
CinderPublic: {protocol: 'https', port: '13776', host: 'IP_ADDRESS'}
|
||||
|
||||
@ -199,6 +199,21 @@ Swift:
|
||||
S3:
|
||||
port: 8080
|
||||
|
||||
CephRgw:
|
||||
Internal:
|
||||
net_param: CephRgw
|
||||
uri_suffixes:
|
||||
'': /swift/v1
|
||||
Public:
|
||||
net_param: Public
|
||||
uri_suffixes:
|
||||
'': /swift/v1
|
||||
Admin:
|
||||
net_param: CephRgw
|
||||
uri_suffixes:
|
||||
'': /swift/v1
|
||||
port: 8080
|
||||
|
||||
Sahara:
|
||||
Internal:
|
||||
net_param: SaharaApi
|
||||
|
||||
@ -25,6 +25,9 @@ parameters:
|
||||
CeilometerAdmin: {protocol: http, port: '8777', host: IP_ADDRESS}
|
||||
CeilometerInternal: {protocol: http, port: '8777', host: IP_ADDRESS}
|
||||
CeilometerPublic: {protocol: http, port: '8777', host: IP_ADDRESS}
|
||||
CephRgwAdmin: {protocol: http, port: '8080', host: IP_ADDRESS}
|
||||
CephRgwInternal: {protocol: http, port: '8080', host: IP_ADDRESS}
|
||||
CephRgwPublic: {protocol: http, port: '8080', host: IP_ADDRESS}
|
||||
CinderAdmin: {protocol: http, port: '8776', host: IP_ADDRESS}
|
||||
CinderInternal: {protocol: http, port: '8776', host: IP_ADDRESS}
|
||||
CinderPublic: {protocol: http, port: '8776', host: IP_ADDRESS}
|
||||
@ -563,6 +566,252 @@ outputs:
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, CeilometerPublic, port]
|
||||
CephRgwAdmin:
|
||||
host:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwAdmin, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
template: NETWORK_uri
|
||||
host_nobrackets:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwAdmin, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
port:
|
||||
get_param: [EndpointMap, CephRgwAdmin, port]
|
||||
protocol:
|
||||
get_param: [EndpointMap, CephRgwAdmin, protocol]
|
||||
uri:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, CephRgwAdmin, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwAdmin, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, CephRgwAdmin, port]
|
||||
- /swift/v1
|
||||
uri_no_suffix:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, CephRgwAdmin, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwAdmin, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, CephRgwAdmin, port]
|
||||
CephRgwInternal:
|
||||
host:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
template: NETWORK_uri
|
||||
host_nobrackets:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
port:
|
||||
get_param: [EndpointMap, CephRgwInternal, port]
|
||||
protocol:
|
||||
get_param: [EndpointMap, CephRgwInternal, protocol]
|
||||
uri:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, CephRgwInternal, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, CephRgwInternal, port]
|
||||
- /swift/v1
|
||||
uri_no_suffix:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, CephRgwInternal, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwInternal, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, CephRgwNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, CephRgwInternal, port]
|
||||
CephRgwPublic:
|
||||
host:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwPublic, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, PublicNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, PublicNetwork]
|
||||
template: NETWORK_uri
|
||||
host_nobrackets:
|
||||
str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwPublic, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, PublicNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- get_param: [ServiceNetMap, PublicNetwork]
|
||||
port:
|
||||
get_param: [EndpointMap, CephRgwPublic, port]
|
||||
protocol:
|
||||
get_param: [EndpointMap, CephRgwPublic, protocol]
|
||||
uri:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, CephRgwPublic, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwPublic, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, PublicNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, PublicNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, CephRgwPublic, port]
|
||||
- /swift/v1
|
||||
uri_no_suffix:
|
||||
list_join:
|
||||
- ''
|
||||
- - get_param: [EndpointMap, CephRgwPublic, protocol]
|
||||
- ://
|
||||
- str_replace:
|
||||
template:
|
||||
get_param: [EndpointMap, CephRgwPublic, host]
|
||||
params:
|
||||
CLOUDNAME:
|
||||
get_param:
|
||||
- CloudEndpoints
|
||||
- get_param: [ServiceNetMap, PublicNetwork]
|
||||
IP_ADDRESS:
|
||||
get_param:
|
||||
- NetIpMap
|
||||
- str_replace:
|
||||
params:
|
||||
NETWORK:
|
||||
get_param: [ServiceNetMap, PublicNetwork]
|
||||
template: NETWORK_uri
|
||||
- ':'
|
||||
- get_param: [EndpointMap, CephRgwPublic, port]
|
||||
CinderAdmin:
|
||||
host:
|
||||
str_replace:
|
||||
|
||||
@ -45,6 +45,7 @@ parameters:
|
||||
MysqlNetwork: internal_api
|
||||
CephClusterNetwork: storage_mgmt
|
||||
CephMonNetwork: storage
|
||||
CephRgwNetwork: storage
|
||||
ControllerHostnameResolveNetwork: internal_api
|
||||
ComputeHostnameResolveNetwork: internal_api
|
||||
BlockStorageHostnameResolveNetwork: internal_api
|
||||
|
||||
@ -139,6 +139,7 @@ resource_registry:
|
||||
OS::TripleO::Services::Apache: puppet/services/apache.yaml
|
||||
OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml
|
||||
OS::TripleO::Services::CephMon: OS::Heat::None
|
||||
OS::TripleO::Services::CephRgw: OS::Heat::None
|
||||
OS::TripleO::Services::CephOSD: OS::Heat::None
|
||||
OS::TripleO::Services::CephClient: OS::Heat::None
|
||||
OS::TripleO::Services::CephExternal: OS::Heat::None
|
||||
|
||||
@ -507,6 +507,9 @@ outputs:
|
||||
CeilometerInternalVip:
|
||||
description: VIP for Ceilometer API internal endpoint
|
||||
value: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, CeilometerApiNetwork]}]}
|
||||
CephRgwInternalVip:
|
||||
description: VIP for Ceph RGW internal endpoint
|
||||
value: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, CephRgwNetwork]}]}
|
||||
CinderInternalVip:
|
||||
description: VIP for Cinder API internal endpoint
|
||||
value: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, CinderApiNetwork]}]}
|
||||
|
||||
77
puppet/services/ceph-rgw.yaml
Normal file
77
puppet/services/ceph-rgw.yaml
Normal file
@ -0,0 +1,77 @@
|
||||
heat_template_version: 2016-04-08
|
||||
|
||||
description: >
|
||||
Ceph RadosGW service.
|
||||
|
||||
parameters:
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
via parameter_defaults in the resource registry. This
|
||||
mapping overrides those in ServiceNetMapDefaults.
|
||||
type: json
|
||||
DefaultPasswords:
|
||||
default: {}
|
||||
type: json
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
AdminToken:
|
||||
description: The keystone auth secret and db password.
|
||||
type: string
|
||||
hidden: true
|
||||
CephRgwKey:
|
||||
description: The cephx key for the radosgw client. Can be created
|
||||
with ceph-authtool --gen-print-key.
|
||||
type: string
|
||||
hidden: true
|
||||
SwiftPassword:
|
||||
description: The password for the swift service account, used by the Ceph RGW services.
|
||||
type: string
|
||||
hidden: true
|
||||
KeystoneRegion:
|
||||
type: string
|
||||
default: 'regionOne'
|
||||
description: Keystone region for endpoint
|
||||
|
||||
resources:
|
||||
CephBase:
|
||||
type: ./ceph-base.yaml
|
||||
properties:
|
||||
ServiceNetMap: {get_param: ServiceNetMap}
|
||||
DefaultPasswords: {get_param: DefaultPasswords}
|
||||
EndpointMap: {get_param: EndpointMap}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Ceph RadosGW service.
|
||||
value:
|
||||
service_name: ceph_rgw
|
||||
config_settings:
|
||||
map_merge:
|
||||
- get_attr: [CephBase, role_data, config_settings]
|
||||
- tripleo::profile::base::ceph::rgw::rgw_key: {get_param: CephRgwKey}
|
||||
tripleo::profile::base::ceph::rgw::keystone_admin_token: {get_param: AdminToken}
|
||||
tripleo::profile::base::ceph::rgw::keystone_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
ceph::profile::params::frontend_type: 'civetweb'
|
||||
ceph_rgw_civetweb_bind_address: {get_param: [ServiceNetMap, CephRgwNetwork]}
|
||||
ceph::profile::params::rgw_frontends:
|
||||
list_join:
|
||||
- ''
|
||||
- - 'civetweb port='
|
||||
- '%{hiera("ceph_rgw_civetweb_bind_address")}'
|
||||
- ':'
|
||||
- {get_param: [EndpointMap, CephRgwInternal, port]}
|
||||
tripleo.ceph_rgw.firewall_rules:
|
||||
'122 ceph rgw':
|
||||
dport: {get_param: [EndpointMap, CephRgwInternal, port]}
|
||||
ceph::rgw::keystone::auth::public_url: {get_param: [EndpointMap, CephRgwPublic, uri]}
|
||||
ceph::rgw::keystone::auth::internal_url: {get_param: [EndpointMap, CephRgwInternal, uri]}
|
||||
ceph::rgw::keystone::auth::admin_url: {get_param: [EndpointMap, CephRgwAdmin, uri]}
|
||||
ceph::rgw::keystone::auth::password: {get_param: SwiftPassword}
|
||||
ceph::rgw::keystone::auth::region: {get_param: KeystoneRegion}
|
||||
ceph::rgw::keystone::auth::tenant: 'service'
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::ceph::rgw
|
||||
Loading…
Reference in New Issue
Block a user