Add sriov_numvfs in THT

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

diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml
index 02746a9..558f275 100644 (file)
--- 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
@@ -36,10 +45,29 @@ 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}
         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
       step_config: |
         include ::tripleo::profile::base::swift::storage