Merge "Add support for isolating block storage nets"

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

diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml
index 11ddef8..1548103 100644 (file)
--- a/puppet/swift-storage-puppet.yaml
+++ b/puppet/swift-storage-puppet.yaml
@@ -155,10 +155,10 @@ resources:
 
   SwiftStorageHieraDeploy:
     type: OS::Heat::StructuredDeployment
+    depends_on: NetworkDeployment
     properties:
       server: {get_resource: SwiftStorage}
       config: {get_resource: SwiftStorageHieraConfig}
-      signal_transport: NO_SIGNAL
       input_values:
         local_ip: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
         snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
@@ -192,7 +192,7 @@ outputs:
   hosts_entry:
     value:
       str_replace:
-        template: "IP HOST"
+        template: "IP HOST.localdomain HOST"
         params:
           IP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
           HOST: {get_attr: [SwiftStorage, name]}