aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
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
parent17c0f43894ff1ff4d7d8392f4ee1cc129431453c (diff)
parent52d19892c12ff785adc0f914647307c1287c059c (diff)
Merge "Allows for customization of NetworkDeployment actions"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/ceph-storage.yaml7
-rw-r--r--puppet/cinder-storage.yaml6
-rw-r--r--puppet/compute.yaml6
-rw-r--r--puppet/controller.yaml6
-rw-r--r--puppet/swift-storage.yaml7
5 files changed, 30 insertions, 2 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 0d968504..0bf0fde4 100644
--- 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 b536418d..b500e43b 100644
--- 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 c147a0f7..6ae39132 100644
--- 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 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}
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 3d9b9018..19a7c7a3 100644
--- 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