Add Ceph related templates needed to configure Cinder with Ceph

[apex-tripleo-heat-templates.git] / swift-storage-puppet.yaml

diff --git a/swift-storage-puppet.yaml b/swift-storage-puppet.yaml
index 38183bb..a529330 100644 (file)
--- a/swift-storage-puppet.yaml
+++ b/swift-storage-puppet.yaml
@@ -33,7 +33,7 @@ parameters:
     type: number
   Replicas:
     type: number
-    default: 1
+    default: 3
     description: How many replicas to use in the swift rings.
   SnmpdReadonlyUserName:
     default: ro_snmp_user
@@ -44,6 +44,13 @@ parameters:
     description: The user password for SNMPd with readonly rights running on all Overcloud nodes
     type: string
     hidden: true
+  NtpServer:
+    type: string
+    default: ''
+  EnablePackageInstall:
+    default: 'false'
+    description: Set to true to enable package installation via Puppet
+    type: boolean
 
 resources:
 
@@ -114,9 +121,11 @@ resources:
                 swift::storage::all::storage_local_net_ip: {get_input: local_ip}
                 swift_mount_check: {get_input: swift_mount_check }
                 tripleo::ringbuilder::min_part_hours: { get_input: swift_min_part_hours }
+                ntp::servers: {get_input: ntp_servers}
                 # NOTE(dprince): build_ring support is currently not wired in.
                 # See: https://review.openstack.org/#/c/109225/
                 tripleo::ringbuilder::build_ring: True
+                enable_package_install: {get_input: enable_package_install}
 
 
   SwiftStorageHieraDeploy:
@@ -134,6 +143,12 @@ resources:
         swift_min_part_hours: {get_param: MinPartHours}
         swift_part_power: {get_param: PartPower}
         swift_replicas: { get_param: Replicas}
+        ntp_servers:
+          str_replace:
+            template: '["server"]'
+            params:
+              server: {get_param: NtpServer}
+        enable_package_install: {get_param: EnablePackageInstall}
 
 outputs:
   hosts_entry: