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

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

diff --git a/cinder-storage.yaml b/cinder-storage.yaml
index 3a93849..7d44094 100644 (file)
--- a/cinder-storage.yaml
+++ b/cinder-storage.yaml
@@ -103,9 +103,23 @@ resources:
         {get_param: Image}
       flavor: {get_param: Flavor}
       key_name: {get_param: KeyName}
-      user_data_format: SOFTWARE_CONFIG
       networks:
         - network: ctlplane
+      user_data_format: SOFTWARE_CONFIG
+      user_data: {get_resource: NodeUserData}
+
+  NodeUserData:
+    type: OS::TripleO::NodeUserData
+
+  NetworkConfig:
+    type: OS::TripleO::BlockStorage::Net::SoftwareConfig
+
+  NetworkDeployment:
+    type: OS::TripleO::SoftwareDeployment
+    properties:
+      config: {get_attr: [NetworkConfig, config_id]}
+      server: {get_resource: BlockStorage}
+
   BlockStorageDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
@@ -145,7 +159,7 @@ outputs:
   hosts_entry:
     value:
       str_replace:
-        template: "IP HOST HOST.novalocal"
+        template: "IP HOST"
         params:
           IP: {get_attr: [BlockStorage, networks, ctlplane, 0]}
           HOST: {get_attr: [BlockStorage, name]}