Fix Flavor get_param for Block Storage.

[apex-tripleo-heat-templates.git] / puppet / services / ceph-base.yaml

diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml
index bec4340..415b77b 100644 (file)
--- a/puppet/services/ceph-base.yaml
+++ b/puppet/services/ceph-base.yaml
@@ -36,6 +36,20 @@ parameters:
   NovaRbdPoolName:
     default: vms
     type: string
+  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
   # DEPRECATED options for compatibility with overcloud.yaml
   # This should be removed and manipulation of the ControllerServices list
   # used instead, but we need client support for that first
@@ -58,6 +72,10 @@ outputs:
       config_settings:
         tripleo::profile::base::ceph::ceph_ipv6: {get_param: CephIPv6}
         tripleo::profile::base::ceph::enable_ceph_storage: {get_param: ControllerEnableCephStorage}
+        ceph::profile::params::osd_pool_default_min_size: 1
+        ceph::profile::params::osds: {/srv/data: {}}
+        ceph::profile::params::manage_repo: false
+        ceph::profile::params::authentication_type: cephx
         ceph::profile::params::fsid: {get_param: CephClusterFSID}
         ceph::profile::params::client_keys:
           str_replace: