Merge "Add hooks for extra post-deployment config"

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

diff --git a/swift-storage.yaml b/swift-storage.yaml
index 076d4bc..7160c14 100644 (file)
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -71,7 +71,7 @@ parameters:
     type: number
   Replicas:
     type: number
-    default: 1
+    default: 3
     description: How many replicas to use in the swift rings.
   SnmpdReadonlyUserName:
     default: ro_snmp_user
@@ -108,9 +108,23 @@ resources:
       image: {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::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: