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

13 files changed, 19 insertions, 22 deletions

diff --git a/ceph-storage.yaml b/ceph-storage.yaml
index aa957e69..74530147 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 b0f227b2..30eae1d9 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 ee6d96eb..8e5cdec7 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 439c79f9..a2da3d39 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 d41356ac..d74fc0bc 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 a7450c44..c3416e02 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 70c57aa4..3d88dd9c 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 49346cd7..00dbca01 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 cf483db4..c69a0f3c 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 eb384646..28a4e045 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 61a10159..3e522df9 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 13328221..12292dec 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 0b9cf3b8..68923eef 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: