Merge "Add Ceph RBD mirror Pacemaker profile"

This commit is contained in:
Jenkins 2017-01-26 18:37:56 +00:00 committed by Gerrit Code Review
commit 47b30fdff5
4 changed files with 51 additions and 0 deletions

View File

@ -0,0 +1,2 @@
resource_registry:
OS::TripleO::Services::CephRbdMirror: ../../puppet/services/pacemaker/ceph-rbdmirror.yaml

View File

@ -119,6 +119,7 @@ resource_registry:
OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml
OS::TripleO::Services::CephMds: OS::Heat::None
OS::TripleO::Services::CephMon: OS::Heat::None
OS::TripleO::Services::CephRbdMirror: OS::Heat::None
OS::TripleO::Services::CephRgw: OS::Heat::None
OS::TripleO::Services::CephOSD: OS::Heat::None
OS::TripleO::Services::CephClient: OS::Heat::None

View File

@ -0,0 +1,47 @@
heat_template_version: ocata
description: >
Ceph RBD mirror 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
CephClientUserName:
default: openstack
type: string
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 RBD mirrror service.
value:
service_name: ceph_rbdmirror
config_settings:
map_merge:
- get_attr: [CephBase, role_data, config_settings]
- tripleo::profile::pacemaker::ceph::rbdmirror::client_name: {get_param: CephClientUserName}
tripleo.ceph_rbdmirror.firewall_rules:
'113 ceph_rbdmirror':
dport:
- '6800-7300'
step_config: |
include ::tripleo::profile::pacemaker::ceph::rbdmirror

View File

@ -32,6 +32,7 @@
- OS::TripleO::Services::CephMds
- OS::TripleO::Services::CephMon
- OS::TripleO::Services::CephExternal
- OS::TripleO::Services::CephRbdMirror
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackup