Mount /var/lib/neutron in neutron agents for metadata proxy

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

diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml
index 2855230..3e4f5b4 100644 (file)
--- a/puppet/services/ceph-mon.yaml
+++ b/puppet/services/ceph-mon.yaml
@@ -4,6 +4,10 @@ description: >
   Ceph Monitor service.
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -69,11 +73,11 @@ parameters:
     type: json
   CephValidationRetries:
     type: number
-    default: 5
+    default: 40
     description: Number of retry attempts for Ceph validation
   CephValidationDelay:
     type: number
-    default: 10
+    default: 30
     description: Interval (in seconds) in between validation checks
   MonitoringSubscriptionCephMon:
     default: 'overcloud-ceph-mon'
@@ -87,6 +91,7 @@ resources:
   CephBase:
     type: ./ceph-base.yaml
     properties:
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
@@ -167,6 +172,6 @@ outputs:
           until: ceph_quorum_nodecheck.rc == 0
           retries: {get_param: CephValidationRetries}
           delay: {get_param: CephValidationDelay}
-        - name: ceph osd crush tunables default
+        - name: set crush tunables
           tags: step0
-          shell: ceph osd crush tunables default
+          shell: ceph osd crush tunables optimal