openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Specify group os-apply-config for config resources"

Browse Source
This commit is contained in:
Jenkins 2014-05-20 15:56:07 +00:00 committed by Gerrit Code Review
commit 46748fdffb
5 changed files with 7 additions and 0 deletions

1
block-storage.yaml

@ -34,6 +34,7 @@ Resources:
BlockStorageConfig:
Type: OS::Heat::StructuredConfig
Properties:
group: os-apply-config
config:
admin-password: {Ref: AdminPassword}
keystone:

2
nova-compute-config.yaml

@ -2,6 +2,7 @@ Resources:
NovaComputeConfig:
Type: OS::Heat::StructuredConfig
Properties:
group: os-apply-config
config:
nova:
compute_driver: { get_input: nova_compute_driver }
@ -52,4 +53,5 @@ Resources:
NovaComputePassthrough:
Type: OS::Heat::StructuredConfig
Properties:
group: os-apply-config
config: {get_input: passthrough_config}

2
overcloud-source.yaml

@ -353,6 +353,7 @@ Resources:
controllerConfig:
Type: OS::Heat::StructuredConfig
Properties:
group: os-apply-config
config:
completion-signal: {get_input: deploy_signal_id}
admin-password:
@ -475,6 +476,7 @@ Resources:
controllerPassthrough:
Type: OS::Heat::StructuredConfig
Properties:
group: os-apply-config
config: {get_input: passthrough_config}
controller0:
Type: OS::Nova::Server

1
ssl-source.yaml

@ -14,6 +14,7 @@ Resources:
SSLConfig:
Type: OS::Heat::StructuredConfig
Properties:
group: os-apply-config
config:
stunnel:
cert:

1
swift-source.yaml

@ -2,6 +2,7 @@ Resources:
SwiftConfig:
Type: OS::Heat::StructuredConfig
Properties:
group: os-apply-config
config:
swift:
devices: { get_input: swift_devices }