openstack/tripleo-heat-templates
Code Issues Proposed changes

Switch net-config templates to use OS::stack_id

Browse Source 
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
This commit is contained in:
Dan Prince 2015-05-19 12:19:52 -07:00
parent cfdd314564
commit e38f7cae7d
13 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-storage.yaml
View File

@ -64,7 +64,7 @@ resources:
NetworkDeployment: NetworkDeployment:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
properties: properties:
config: {get_attr: [NetworkConfig, config_id]} config: {get_resource: NetworkConfig}
server: {get_resource: CephStorage} server: {get_resource: CephStorage}
CephStorageDeployment: CephStorageDeployment:

2
cinder-storage.yaml
View File

@ -136,7 +136,7 @@ resources:
NetworkDeployment: NetworkDeployment:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
properties: properties:
config: {get_attr: [NetworkConfig, config_id]} config: {get_resource: NetworkConfig}
server: {get_resource: BlockStorage} server: {get_resource: BlockStorage}
BlockStorageDeployment: BlockStorageDeployment:

2
compute.yaml
View File

@ -290,7 +290,7 @@ resources:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
properties: properties:
signal_transport: NO_SIGNAL signal_transport: NO_SIGNAL
config: {get_attr: [NetworkConfig, config_id]} config: {get_resource: NetworkConfig}
server: {get_resource: NovaCompute} server: {get_resource: NovaCompute}
input_values: input_values:
bridge_name: {get_param: NeutronPhysicalBridge} bridge_name: {get_param: NeutronPhysicalBridge}

2
controller.yaml
View File

@ -475,7 +475,7 @@ resources:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
properties: properties:
signal_transport: NO_SIGNAL signal_transport: NO_SIGNAL
config: {get_attr: [NetworkConfig, config_id]} config: {get_resource: NetworkConfig}
server: {get_resource: Controller} server: {get_resource: Controller}
input_values: input_values:
bridge_name: br-ex bridge_name: br-ex

7
net-config-bond.yaml
View File

@ -60,7 +60,6 @@ resources:
name: nic2 name: nic2
outputs: outputs:
config_id: OS::stack_id:
description: The ID of the OsNetConfigImpl resource. description: The OsNetConfigImpl resource.
value: value: {get_resource: OsNetConfigImpl}
{get_resource: OsNetConfigImpl}

7
net-config-bridge.yaml
View File

@ -53,7 +53,6 @@ resources:
primary: true primary: true
outputs: outputs:
config_id: OS::stack_id:
description: The ID of the OsNetConfigImpl resource. description: The OsNetConfigImpl resource.
value: value: {get_resource: OsNetConfigImpl}
{get_resource: OsNetConfigImpl}

7
net-config-noop.yaml
View File

@ -34,7 +34,6 @@ resources:
config: config:
outputs: outputs:
config_id: OS::stack_id:
description: The ID of the OsNetConfigImpl resource. description: The OsNetConfigImpl resource.
value: value: {get_resource: OsNetConfigImpl}
{get_resource: OsNetConfigImpl}

2
puppet/ceph-storage-puppet.yaml
View File

@ -64,7 +64,7 @@ resources:
NetworkDeployment: NetworkDeployment:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
properties: properties:
config: {get_attr: [NetworkConfig, config_id]} config: {get_resource: NetworkConfig}
server: {get_resource: CephStorage} server: {get_resource: CephStorage}
CephStorageDeployment: CephStorageDeployment:

2
puppet/cinder-storage-puppet.yaml
View File

@ -148,7 +148,7 @@ resources:
NetworkDeployment: NetworkDeployment:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
properties: properties:
config: {get_attr: [NetworkConfig, config_id]} config: {get_resource: NetworkConfig}
server: {get_resource: BlockStorage} server: {get_resource: BlockStorage}
BlockStorageDeployment: BlockStorageDeployment:

2
puppet/compute-puppet.yaml
View File

@ -305,7 +305,7 @@ resources:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
properties: properties:
signal_transport: NO_SIGNAL signal_transport: NO_SIGNAL
config: {get_attr: [NetworkConfig, config_id]} config: {get_resource: NetworkConfig}
server: {get_resource: NovaCompute} server: {get_resource: NovaCompute}
input_values: input_values:
bridge_name: {get_param: NeutronPhysicalBridge} bridge_name: {get_param: NeutronPhysicalBridge}

2
puppet/controller-puppet.yaml
View File

@ -496,7 +496,7 @@ resources:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
properties: properties:
signal_transport: NO_SIGNAL signal_transport: NO_SIGNAL
config: {get_attr: [NetworkConfig, config_id]} config: {get_resource: NetworkConfig}
server: {get_resource: Controller} server: {get_resource: Controller}
input_values: input_values:
bridge_name: br-ex bridge_name: br-ex

2
puppet/swift-storage-puppet.yaml
View File

@ -93,7 +93,7 @@ resources:
NetworkDeployment: NetworkDeployment:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
properties: properties:
config: {get_attr: [NetworkConfig, config_id]} config: {get_resource: NetworkConfig}
server: {get_resource: SwiftStorage} server: {get_resource: SwiftStorage}
SwiftStorageHieraConfig: SwiftStorageHieraConfig:

2
swift-storage.yaml
View File

@ -141,7 +141,7 @@ resources:
NetworkDeployment: NetworkDeployment:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
properties: properties:
config: {get_attr: [NetworkConfig, config_id]} config: {get_resource: NetworkConfig}
server: {get_resource: SwiftStorage} server: {get_resource: SwiftStorage}
SwiftStorageDeploy: SwiftStorageDeploy: