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

diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml
index 980c95f5..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,9 +49,30 @@ outputs:
   role_data:
     description: Role data for the Swift Proxy role.
     value:
+      service_name: swift_storage
       config_settings:
         # Swift
         swift::storage::all::mount_check: {get_param: SwiftMountCheck}
         tripleo::profile::base::swift::storage::enable_swift_storage: {get_param: ControllerEnableSwiftStorage}
+        tripleo.swift_storage.firewall_rules:
+          '123 swift storage':
+            dport:
+              - 873
+              - 6000
+              - 6001
+              - 6002
+        swift::storage::all::incoming_chmod: 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r'
+        swift::storage::all::outgoing_chmod: 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r'
+        swift::storage::all::object_pipeline:
+          - healthcheck
+          - recon
+          - object-server
+        swift::storage::all::container_pipeline:
+          - healthcheck
+          - container-server
+        swift::storage::all::account_pipeline:
+          - healthcheck
+          - account-server
+        swift::storage::disks: {get_param: SwiftRawDisks}
       step_config: |
         include ::tripleo::profile::base::swift::storage