summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-11 13:17:24 +0000
committerGerrit Code Review <review@openstack.org>2017-01-11 13:17:24 +0000
commit5834315ded693d35a7ad97d3760381056eb398a1 (patch)
treeb06b2e7806edda39f0bb029c0232a7d0eeb0de29
parenta70e6a15c4b8eeec511ba3c836e9ba9c285fd431 (diff)
parent42c31dc6a06cd7e604ba9022228c69562d6bb207 (diff)
Merge "Add support for the deployment of Ceph MDS"
-rw-r--r--environments/services/ceph-mds.yaml2
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml1
-rw-r--r--puppet/services/ceph-mds.yaml49
-rw-r--r--roles_data.yaml1
4 files changed, 53 insertions, 0 deletions
diff --git a/environments/services/ceph-mds.yaml b/environments/services/ceph-mds.yaml
new file mode 100644
index 00000000..2b51374c
--- /dev/null
+++ b/environments/services/ceph-mds.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+ OS::TripleO::Services::CephMds: ../../puppet/services/ceph-mds.yaml \ No newline at end of file
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index c850ee1b..44a2486f 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -117,6 +117,7 @@ resource_registry:
OS::TripleO::Services::Apache: puppet/services/apache.yaml
OS::TripleO::Services::ApacheTLS: OS::Heat::None
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::CephRgw: OS::Heat::None
OS::TripleO::Services::CephOSD: OS::Heat::None
diff --git a/puppet/services/ceph-mds.yaml b/puppet/services/ceph-mds.yaml
new file mode 100644
index 00000000..b68567fb
--- /dev/null
+++ b/puppet/services/ceph-mds.yaml
@@ -0,0 +1,49 @@
+heat_template_version: ocata
+
+description: >
+ Ceph MDS 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
+ CephMdsKey:
+ description: The cephx key for the MDS service. Can be created
+ with ceph-authtool --gen-print-key.
+ type: string
+ hidden: true
+
+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 MDS service.
+ value:
+ service_name: ceph_mds
+ config_settings:
+ map_merge:
+ - get_attr: [CephBase, role_data, config_settings]
+ - ceph::profile::params::mds_key: {get_param: CephMdsKey}
+ tripleo.ceph_mds.firewall_rules:
+ '112 ceph_mds':
+ dport:
+ - '6800-7300'
+ step_config: |
+ include ::tripleo::profile::base::ceph::mds
diff --git a/roles_data.yaml b/roles_data.yaml
index 63126dc8..09531406 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -25,6 +25,7 @@
CountDefault: 1
ServicesDefault:
- OS::TripleO::Services::CACerts
+ - OS::TripleO::Services::CephMds
- OS::TripleO::Services::CephMon
- OS::TripleO::Services::CephExternal
- OS::TripleO::Services::CephRgw