X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fswift-storage.yaml;h=664a701ff46dda7bd0fce07ae9754b7495c4a2ca;hb=5d13a6397c4dccc78dc13c4bf23d651485868904;hp=0c6103929fb4b2ef0baa64244b3c7cd217dcee7c;hpb=1eeb7a806999a85a20dfc86dd465135a885da397;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml
index 0c610392..664a701f 100644
--- a/puppet/services/swift-storage.yaml
+++ b/puppet/services/swift-storage.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Swift Storage service configured with Puppet
 
 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
@@ -17,6 +26,10 @@ parameters:
     default: false
     description: Value of mount_check in Swift account/container/object -server.conf
     type: boolean
+  SwiftRawDisks:
+    default: {}
+    description: 'A hash of additional raw devices to use as Swift backend (eg. {sdb: {}})'
+    type: json
 
   # DEPRECATED options for compatibility with overcloud.yaml
   # This should be removed and manipulation of the ControllerServices list
@@ -36,7 +49,7 @@ outputs:
   role_data:
     description: Role data for the Swift Proxy role.
     value:
-      service_name: swift-storage
+      service_name: swift_storage
       config_settings:
         # Swift
         swift::storage::all::mount_check: {get_param: SwiftMountCheck}
@@ -60,5 +73,6 @@ outputs:
         swift::storage::all::account_pipeline:
           - healthcheck
           - account-server
+        swift::storage::disks: {get_param: SwiftRawDisks}
       step_config: |
         include ::tripleo::profile::base::swift::storage