X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fswift-storage.yaml;h=b933c542f1c4d91c474b9adc51ba1abf7ae74480;hb=1b604a95e91d94e31eba93bce2c57e723780635b;hp=f2ea3939a8505b1200f34518c7c37a23a2df0195;hpb=80e82be09b2354fe21f51784542973bb479c6364;p=apex-tripleo-heat-templates.git

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index f2ea3939..b933c542 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -7,11 +7,6 @@ parameters:
     type: string
     constraints:
       - custom_constraint: nova.flavor
-  HashSuffix:
-    description: A random string to be used as a salt when hashing to determine mappings
-      in the ring.
-    hidden: true
-    type: string
   SwiftStorageImage:
     default: overcloud-full
     type: string
@@ -21,18 +16,6 @@ parameters:
     default: default
     description: Name of an existing Nova key pair to enable SSH access to the instances
     type: string
-  SnmpdReadonlyUserName:
-    default: ro_snmp_user
-    description: The user name for SNMPd with readonly rights running on all Overcloud nodes
-    type: string
-  SnmpdReadonlyUserPassword:
-    description: The user password for SNMPd with readonly rights running on all Overcloud nodes
-    type: string
-    hidden: true
-  EnablePackageInstall:
-    default: 'false'
-    description: Set to true to enable package installation via Puppet
-    type: boolean
   UpdateIdentifier:
     default: ''
     type: string
@@ -105,6 +88,10 @@ parameters:
     type: string
     description: Command which will be run whenever configuration data changes
     default: os-refresh-config --timeout 14400
+  SwiftRawDisks:
+    default: {}
+    description: 'A hash of additional raw devices to use as Swift backend (eg. {sdb: {}})'
+    type: json
 
 resources:
 
@@ -250,7 +237,6 @@ resources:
             - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
-            - network
           merge_behavior: deeper
           datafiles:
             service_names:
@@ -261,20 +247,12 @@ resources:
                 map_replace:
                   - {get_param: ServiceConfigSettings}
                   - values: {get_attr: [NetIpMap, net_ip_map]}
-            network:
-              mapped_data:
-                net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
             object_extraconfig:
               mapped_data: {get_param: ObjectStorageExtraConfig}
             extraconfig:
               mapped_data: {get_param: ExtraConfig}
             object:
               mapped_data: # data supplied directly to this deployment configuration, etc
-                swift::swift_hash_path_suffix: { get_input: swift_hash_suffix }
-                swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
-                snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
-                snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
-                tripleo::packages::enable_install: {get_input: enable_package_install}
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
 
 
@@ -286,13 +264,7 @@ resources:
       server: {get_resource: SwiftStorage}
       config: {get_resource: SwiftStorageHieraConfig}
       input_values:
-        local_ip: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
-        snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
-        snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
-        swift_hash_suffix: {get_param: HashSuffix}
-        enable_package_install: {get_param: EnablePackageInstall}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
-        swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
 
   # Resource for site-specific injection of root certificate
   NodeTLSCAData:
@@ -387,7 +359,14 @@ outputs:
     description: Swift device formatted for swift-ring-builder
     value:
       str_replace:
-        template: 'r1z1-IP:%PORT%/d1'
+        template:
+          list_join:
+            - ','
+            - ['r1z1-IP:%PORT%/d1']
+            - repeat:
+                template: 'r1z1-IP:%PORT%/DEVICE'
+                for_each:
+                  DEVICE: {get_param: SwiftRawDisks}
         params:
           IP:
             get_attr: