Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"

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

diff --git a/swift-storage.yaml b/swift-storage.yaml
index db8ff5d..42c591d 100644 (file)
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -116,6 +116,15 @@ resources:
   NodeUserData:
     type: OS::TripleO::NodeUserData
 
+  NetworkConfig:
+    type: OS::TripleO::ObjectStorage::Net::SoftwareConfig
+
+  NetworkDeployment:
+    type: OS::TripleO::SoftwareDeployment
+    properties:
+      config: {get_attr: [NetworkConfig, config_id]}
+      server: {get_resource: SwiftStorage}
+
   SwiftStorageDeploy:
     type: OS::Heat::StructuredDeployment
     properties:
@@ -136,7 +145,7 @@ outputs:
   hosts_entry:
     value:
       str_replace:
-        template: "IP HOST HOST.novalocal"
+        template: "IP HOST"
         params:
           IP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
           HOST: {get_attr: [SwiftStorage, name]}