aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-05-19 12:19:52 -0700
committerDan Prince <dprince@redhat.com>2015-05-26 08:50:45 -0400
commite38f7cae7db615c36c9e87bd9bb629fd18eda28a (patch)
tree0d00ac5e4409c3ad05c2f394019e56a2f61d5c1c
parentcfdd314564a8531d916cee389990684f9e4e11c8 (diff)
Switch net-config templates to use OS::stack_id
This patch removes the custom config_id outputs and replaces it with OS::stack_id which allows us to just call get_resource in the parent stack. The motivation for this change is we'll be adding more os-net-config templates and it would be nice to take advantage of this newer template feature. Change-Id: I6fcb26024b94420779b86766e16d8a24210c4f8e
-rw-r--r--ceph-storage.yaml2
-rw-r--r--cinder-storage.yaml2
-rw-r--r--compute.yaml2
-rw-r--r--controller.yaml2
-rw-r--r--net-config-bond.yaml7
-rw-r--r--net-config-bridge.yaml7
-rw-r--r--net-config-noop.yaml7
-rw-r--r--puppet/ceph-storage-puppet.yaml2
-rw-r--r--puppet/cinder-storage-puppet.yaml2
-rw-r--r--puppet/compute-puppet.yaml2
-rw-r--r--puppet/controller-puppet.yaml2
-rw-r--r--puppet/swift-storage-puppet.yaml2
-rw-r--r--swift-storage.yaml2
13 files changed, 19 insertions, 22 deletions
diff --git a/ceph-storage.yaml b/ceph-storage.yaml
index aa957e6..7453014 100644
--- a/ceph-storage.yaml
+++ b/ceph-storage.yaml
@@ -64,7 +64,7 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
properties:
- config: {get_attr: [NetworkConfig, config_id]}
+ config: {get_resource: NetworkConfig}
server: {get_resource: CephStorage}
CephStorageDeployment:
diff --git a/cinder-storage.yaml b/cinder-storage.yaml
index b0f227b..30eae1d 100644
--- a/cinder-storage.yaml
+++ b/cinder-storage.yaml
@@ -136,7 +136,7 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
properties:
- config: {get_attr: [NetworkConfig, config_id]}
+ config: {get_resource: NetworkConfig}
server: {get_resource: BlockStorage}
BlockStorageDeployment:
diff --git a/compute.yaml b/compute.yaml
index ee6d96e..8e5cdec 100644
--- a/compute.yaml
+++ b/compute.yaml
@@ -290,7 +290,7 @@ resources:
type: OS::TripleO::SoftwareDeployment
properties:
signal_transport: NO_SIGNAL
- config: {get_attr: [NetworkConfig, config_id]}
+ config: {get_resource: NetworkConfig}
server: {get_resource: NovaCompute}
input_values:
bridge_name: {get_param: NeutronPhysicalBridge}
diff --git a/controller.yaml b/controller.yaml
index 439c79f..a2da3d3 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -475,7 +475,7 @@ resources:
type: OS::TripleO::SoftwareDeployment
properties:
signal_transport: NO_SIGNAL
- config: {get_attr: [NetworkConfig, config_id]}
+ config: {get_resource: NetworkConfig}
server: {get_resource: Controller}
input_values:
bridge_name: br-ex
diff --git a/net-config-bond.yaml b/net-config-bond.yaml
index d41356a..d74fc0b 100644
--- a/net-config-bond.yaml
+++ b/net-config-bond.yaml
@@ -60,7 +60,6 @@ resources:
name: nic2
outputs:
- config_id:
- description: The ID of the OsNetConfigImpl resource.
- value:
- {get_resource: OsNetConfigImpl}
+ OS::stack_id:
+ description: The OsNetConfigImpl resource.
+ value: {get_resource: OsNetConfigImpl}
diff --git a/net-config-bridge.yaml b/net-config-bridge.yaml
index a7450c4..c3416e0 100644
--- a/net-config-bridge.yaml
+++ b/net-config-bridge.yaml
@@ -53,7 +53,6 @@ resources:
primary: true
outputs:
- config_id:
- description: The ID of the OsNetConfigImpl resource.
- value:
- {get_resource: OsNetConfigImpl}
+ OS::stack_id:
+ description: The OsNetConfigImpl resource.
+ value: {get_resource: OsNetConfigImpl}
diff --git a/net-config-noop.yaml b/net-config-noop.yaml
index 70c57aa..3d88dd9 100644
--- a/net-config-noop.yaml
+++ b/net-config-noop.yaml
@@ -34,7 +34,6 @@ resources:
config:
outputs:
- config_id:
- description: The ID of the OsNetConfigImpl resource.
- value:
- {get_resource: OsNetConfigImpl}
+ OS::stack_id:
+ description: The OsNetConfigImpl resource.
+ value: {get_resource: OsNetConfigImpl}
diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml
index 49346cd..00dbca0 100644
--- a/puppet/ceph-storage-puppet.yaml
+++ b/puppet/ceph-storage-puppet.yaml
@@ -64,7 +64,7 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
properties:
- config: {get_attr: [NetworkConfig, config_id]}
+ config: {get_resource: NetworkConfig}
server: {get_resource: CephStorage}
CephStorageDeployment:
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml
index cf483db..c69a0f3 100644
--- a/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage-puppet.yaml
@@ -148,7 +148,7 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
properties:
- config: {get_attr: [NetworkConfig, config_id]}
+ config: {get_resource: NetworkConfig}
server: {get_resource: BlockStorage}
BlockStorageDeployment:
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index eb38464..28a4e04 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -305,7 +305,7 @@ resources:
type: OS::TripleO::SoftwareDeployment
properties:
signal_transport: NO_SIGNAL
- config: {get_attr: [NetworkConfig, config_id]}
+ config: {get_resource: NetworkConfig}
server: {get_resource: NovaCompute}
input_values:
bridge_name: {get_param: NeutronPhysicalBridge}
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 61a1015..3e522df 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -496,7 +496,7 @@ resources:
type: OS::TripleO::SoftwareDeployment
properties:
signal_transport: NO_SIGNAL
- config: {get_attr: [NetworkConfig, config_id]}
+ config: {get_resource: NetworkConfig}
server: {get_resource: Controller}
input_values:
bridge_name: br-ex
diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml
index 1332822..12292de 100644
--- a/puppet/swift-storage-puppet.yaml
+++ b/puppet/swift-storage-puppet.yaml
@@ -93,7 +93,7 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
properties:
- config: {get_attr: [NetworkConfig, config_id]}
+ config: {get_resource: NetworkConfig}
server: {get_resource: SwiftStorage}
SwiftStorageHieraConfig:
diff --git a/swift-storage.yaml b/swift-storage.yaml
index 0b9cf3b..68923ee 100644
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -141,7 +141,7 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
properties:
- config: {get_attr: [NetworkConfig, config_id]}
+ config: {get_resource: NetworkConfig}
server: {get_resource: SwiftStorage}
SwiftStorageDeploy: