diff options
author | Steve Baker <sbaker@redhat.com> | 2014-08-04 08:43:34 +1200 |
---|---|---|
committer | Steve Baker <sbaker@redhat.com> | 2014-08-04 08:57:52 +1200 |
commit | beca15dec5265783047d5df210b270ed3d77dd4b (patch) | |
tree | ae0f9d59cc80f1794e8e31c8d150daad11987371 /undercloud-vm-ironic-deploy.yaml | |
parent | 9413fb3098254fb8cbeb5d4951aba474b8755afb (diff) |
Port all templates to HOT
This change was generated and validated by running the following:
make hot clean all validate-all
This converts all templates to be valid HOT.
Fn::Select is not converted in this change but this will actually
work with heat_template_version 2013-05-23. Fn::Select is converted
manually in the next change in this series.
This change also sets the heat_template_version to 2014-10-16 which
includes the list_join intrinsic functions used throughout these
templates.
Partial-Blueprint: tripleo-juno-remove-mergepy
Change-Id: Ib3cbb83f6ae94adb7b793ab1b662bd5c55cbb5b3
Diffstat (limited to 'undercloud-vm-ironic-deploy.yaml')
-rw-r--r-- | undercloud-vm-ironic-deploy.yaml | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/undercloud-vm-ironic-deploy.yaml b/undercloud-vm-ironic-deploy.yaml index 10eb44d2..8fff9d54 100644 --- a/undercloud-vm-ironic-deploy.yaml +++ b/undercloud-vm-ironic-deploy.yaml @@ -1,31 +1,31 @@ -Parameters: +parameters: IronicPassword: - Type: String - Description: Ironic password for keystone access - NoEcho: true + type: string + description: Ironic password for keystone access + hidden: true NeutronPublicInterface: - Default: eth0 - Description: What interface to bridge onto br-ex for network nodes. - Type: String + default: eth0 + description: What interface to bridge onto br-ex for network nodes. + type: string PowerSSHPrivateKey: - Description: Private key for using to ssh to a virtual power host. - Type: String - NoEcho: true -Resources: + description: Private key for using to ssh to a virtual power host. + type: string + hidden: true +resources: 01_undercloudNovaDeployment: - Type: OS::Heat::StructuredDeployment - Properties: - config: {Ref: undercloudNovaConfig} - server: {Ref: undercloud} + type: OS::Heat::StructuredDeployment + properties: + config: {get_resource: undercloudNovaConfig} + server: {get_resource: undercloud} signal_transport: NO_SIGNAL input_values: - nova_service_password: {Ref: NovaPassword} + nova_service_password: {get_param: NovaPassword} 02_undercloudIronicDeployment: - Type: OS::Heat::StructuredDeployment - Properties: - config: {Ref: undercloudIronicConfig} - server: {Ref: undercloud} + type: OS::Heat::StructuredDeployment + properties: + config: {get_resource: undercloudIronicConfig} + server: {get_resource: undercloud} signal_transport: NO_SIGNAL input_values: - ironic_service_password: {Ref: IronicPassword} - virtual_power_ssh_key: {Ref: PowerSSHPrivateKey} + ironic_service_password: {get_param: IronicPassword} + virtual_power_ssh_key: {get_param: PowerSSHPrivateKey} |