Allows for customization of NetworkDeployment actions

We don't necessarily want the network configuration to be reapplied
with every template update so we add a param to configure on which
action the NetworkDeployment resource should be executed.

Change-Id: I0e86318eb5521e540cc567ce9d77e1060086d48b
Co-Authored-By: Dan Sneddon <dsneddon@redhat.com>
Co-Authored-By: James Slagle <jslagle@redhat.com>
Co-Authored-By: Jiri Stransky <jstransk@redhat.com>
Co-Authored-By: Steven Hardy <shardy@redhat.com>

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 0d96850..0bf0fde 100644 (file)
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -54,7 +54,11 @@ parameters:
     description: |
       Role specific additional hiera configuration to inject into the cluster.
     type: json
-
+  NetworkDeploymentActions:
+    type: comma_delimited_list
+    description: >
+      Heat action when to apply network configuration changes
+    default: ['CREATE']
 
 resources:
   CephStorage:
@@ -126,6 +130,7 @@ resources:
     properties:
       config: {get_resource: NetworkConfig}
       server: {get_resource: CephStorage}
+      actions: {get_param: NetworkDeploymentActions}
 
   CephStorageDeployment:
     type: OS::Heat::StructuredDeployment

diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index b536418..b500e43 100644 (file)
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -107,6 +107,11 @@ parameters:
   MysqlVirtualIP:
     type: string
     default: ''
+  NetworkDeploymentActions:
+    type: comma_delimited_list
+    description: >
+      Heat action when to apply network configuration changes
+    default: ['CREATE']
 
 resources:
   BlockStorage:
@@ -178,6 +183,7 @@ resources:
     properties:
       config: {get_resource: NetworkConfig}
       server: {get_resource: BlockStorage}
+      actions: {get_param: NetworkDeploymentActions}
 
   BlockStorageDeployment:
     type: OS::Heat::StructuredDeployment

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index c147a0f..6ae3913 100644 (file)
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -273,6 +273,11 @@ parameters:
   Hostname:
     type: string
     default: '' # Defaults to Heat created hostname
+  NetworkDeploymentActions:
+    type: comma_delimited_list
+    description: >
+      Heat action when to apply network configuration changes
+    default: ['CREATE']
 
 resources:
 
@@ -347,6 +352,7 @@ resources:
     properties:
       config: {get_resource: NetworkConfig}
       server: {get_resource: NovaCompute}
+      actions: {get_param: NetworkDeploymentActions}
       input_values:
         bridge_name: {get_param: NeutronPhysicalBridge}
         interface_name: {get_param: NeutronPublicInterface}

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 2e8c312..0c921eb 100644 (file)
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -606,6 +606,11 @@ parameters:
   Hostname:
     type: string
     default: '' # Defaults to Heat created hostname
+  NetworkDeploymentActions:
+    type: comma_delimited_list
+    description: >
+      Heat action when to apply network configuration changes
+    default: ['CREATE']
 
 resources:
 
@@ -702,6 +707,7 @@ resources:
     properties:
       config: {get_resource: NetworkConfig}
       server: {get_resource: Controller}
+      actions: {get_param: NetworkDeploymentActions}
       input_values:
         bridge_name: br-ex
         interface_name: {get_param: NeutronPublicInterface}

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 3d9b901..19a7c7a 100644 (file)
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -77,7 +77,11 @@ parameters:
     description: |
       Role specific additional hiera configuration to inject into the cluster.
     type: json
-
+  NetworkDeploymentActions:
+    type: comma_delimited_list
+    description: >
+      Heat action when to apply network configuration changes
+    default: ['CREATE']
 
 resources:
 
@@ -149,6 +153,7 @@ resources:
     properties:
       config: {get_resource: NetworkConfig}
       server: {get_resource: SwiftStorage}
+      actions: {get_param: NetworkDeploymentActions}
 
   SwiftStorageHieraConfig:
     type: OS::Heat::StructuredConfig