Change flat network name for nosdn fdio scenario

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

diff --git a/puppet/services/external-swift-proxy.yaml b/puppet/services/external-swift-proxy.yaml
index 75f5b6a..ac1f11a 100644 (file)
--- a/puppet/services/external-swift-proxy.yaml
+++ b/puppet/services/external-swift-proxy.yaml
@@ -1,9 +1,35 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   External Swift Proxy endpoint configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  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
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
   ExternalPublicUrl:
     description: Public endpoint url for the external swift proxy
     type: string
@@ -18,27 +44,13 @@ parameters:
     type: string
     default: 'service'
   SwiftPassword:
-    description: The password for the swift service account, used by the swift proxy services.
+    description: The password for the swift service account
     type: string
     hidden: true
   KeystoneRegion:
     type: string
     default: 'regionOne'
     description: Keystone region for endpoint
-  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
-                 via parameter_defaults in the resource registry.
-    type: json
 
 resources: