X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fswift-storage.yaml;h=9d049bd3d7a42d9d74e025555413375d76230bf8;hb=279a2a0cea6c8d58bea308266f90a1a4db7edd6f;hp=22e2b4a3266cf44def73774d418c220b2be4b797;hpb=6fab74a693b6068c3c4ccc1ff4477e60dff4a0fe;p=apex-tripleo-heat-templates.git

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 22e2b4a3..9d049bd3 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -112,11 +112,18 @@ parameters:
   ServiceConfigSettings:
     type: json
     default: {}
+  ConfigCommand:
+    type: string
+    description: Command which will be run whenever configuration data changes
+    default: os-refresh-config --timeout 14400
 
 resources:
 
   SwiftStorage:
     type: OS::Nova::Server
+    metadata:
+      os-collect-config:
+        command: {get_param: ConfigCommand}
     properties:
       image: {get_param: Image}
       flavor: {get_param: Flavor}
@@ -333,6 +340,12 @@ resources:
           get_param: UpdateIdentifier
 
 outputs:
+  ip_address:
+    description: IP address of the server in the ctlplane network
+    value: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
+  hostname:
+    description: Hostname of the server
+    value: {get_attr: [SwiftStorage, name]}
   hosts_entry:
     value:
       str_replace:
@@ -413,11 +426,3 @@ outputs:
   management_ip_address:
     description: IP address of the server in the management network
     value: {get_attr: [ManagementPort, ip_address]}
-  config_identifier:
-    description: identifier which changes if the node configuration may need re-applying
-    value:
-      list_join:
-        - ','
-        - - {get_attr: [SwiftStorageHieraDeploy, deploy_stdout]}
-          - {get_attr: [NodeTLSCAData, deploy_stdout]}
-          - {get_param: UpdateIdentifier}