aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-23 09:48:47 +0000
committerGerrit Code Review <review@openstack.org>2015-11-23 09:48:47 +0000
commitf6093f3081d70496ca99a358a2e484a85ff02926 (patch)
tree1ef52d9ca636a5fcefb431dfd40132a2c97d4c5d /puppet/controller.yaml
parent17c0f43894ff1ff4d7d8392f4ee1cc129431453c (diff)
parent52d19892c12ff785adc0f914647307c1287c059c (diff)
Merge "Allows for customization of NetworkDeployment actions"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 2e8c3126..0c921eb6 100644
--- 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}