From beca15dec5265783047d5df210b270ed3d77dd4b Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 4 Aug 2014 08:43:34 +1200 Subject: 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 --- undercloud-source.yaml | 340 ++++++++++++++++++++++++------------------------- 1 file changed, 170 insertions(+), 170 deletions(-) (limited to 'undercloud-source.yaml') diff --git a/undercloud-source.yaml b/undercloud-source.yaml index aa0c9eed..e39eb5ee 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -1,46 +1,46 @@ -Description: All-in-one baremetal OpenStack and all dependencies. -HeatTemplateFormatVersion: '2012-12-12' -Parameters: +description: All-in-one baremetal OpenStack and all dependencies. +heat_template_version: 2014-10-16 +parameters: AdminPassword: - Default: unset - Description: The password for the keystone admin account, used for monitoring, querying neutron etc. - Type: String - NoEcho: true + default: unset + description: The password for the keystone admin account, used for monitoring, querying neutron etc. + type: string + hidden: true AdminToken: - Default: unset - Description: The keystone auth secret. - Type: String - NoEcho: true + default: unset + description: The keystone auth secret. + type: string + hidden: true CinderLVMLoopDeviceSize: - Default: 5000 - Description: The size of the loopback file used by the cinder LVM driver. - Type: Number + default: 5000 + description: The size of the loopback file used by the cinder LVM driver. + type: number BaremetalArch: - Default: i386 - Description: The architecture to use in Nova-BM - i386 or amd64. - Type: String + default: i386 + description: The architecture to use in Nova-BM - i386 or amd64. + type: string CeilometerMeteringSecret: - Default: unset - Description: Secret shared by the ceilometer services. - Type: String - NoEcho: true + default: unset + description: Secret shared by the ceilometer services. + type: string + hidden: true CeilometerPassword: - Default: unset - Description: The password for the ceilometer service account. - Type: String - NoEcho: true + default: unset + description: The password for the ceilometer service account. + type: string + hidden: true SnmpdReadonlyUserName: - Default: ro_snmp_user - Description: The user name for SNMPd with readonly rights running on all Overcloud nodes - Type: String + default: ro_snmp_user + description: The user name for SNMPd with readonly rights running on all Overcloud nodes + type: string SnmpdReadonlyUserPassword: - Default: unset - Description: The user password for SNMPd with readonly rights running on all Overcloud nodes - Type: String - NoEcho: true + default: unset + description: The user password for SNMPd with readonly rights running on all Overcloud nodes + type: string + hidden: true ExtraConfig: - Default: {} - Description: | + default: {} + description: | Additional configuration to inject into the cluster. The JSON should have the following structure: {"FILEKEY": @@ -75,128 +75,128 @@ Parameters: ] } } - Type: Json + type: json Flavor: - Default: baremetal - Description: Flavor to request when deploying. - Type: String + default: baremetal + description: Flavor to request when deploying. + type: string GlancePort: - Default: 9292 - Description: Glance port. - Type: String + default: 9292 + description: Glance port. + type: string GlanceProtocol: - Default: http - Description: Protocol to use when connecting to glance, set to https for SSL. - Type: String + default: http + description: Protocol to use when connecting to glance, set to https for SSL. + type: string GlancePassword: - Default: unset - Description: The password for the glance service account, used by the glance services. - Type: String - NoEcho: true + default: unset + description: The password for the glance service account, used by the glance services. + type: string + hidden: true GlanceNotifierStrategy: - Description: Strategy to use for Glance notification queue - Type: String - Default: noop + description: Strategy to use for Glance notification queue + type: string + default: noop GlanceLogFile: - Description: The filepath of the file to use for logging messages from Glance. - Type: String - Default: '' + description: The filepath of the file to use for logging messages from Glance. + type: string + default: '' KeyName: - Default: default - Description: Name of an existing EC2 KeyPair to enable SSH access to the instances - Type: String + default: default + description: Name of an existing EC2 KeyPair to enable SSH access to the instances + type: string HeatPassword: - Default: unset - Description: The password for the Heat service account, used by the Heat services. - Type: String - NoEcho: true + default: unset + description: The password for the Heat service account, used by the Heat services. + type: string + hidden: true ImageUpdatePolicy: - Default: REBUILD_PRESERVE_EPHEMERAL - Description: What policy to use when reconstructing instances. REBUILD for rebuilds, + default: REBUILD_PRESERVE_EPHEMERAL + description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt. - Type: String + type: string undercloudImage: - Default: undercloud - Type: String + default: undercloud + type: string NeutronPassword: - Default: unset - Description: The password for the neutron service account, used by neutron agents. - Type: String - NoEcho: true + default: unset + description: The password for the neutron service account, used by neutron agents. + type: string + hidden: true NovaPassword: - Default: unset - Description: The password for the nova service account, used by nova-api. - Type: String - NoEcho: true + default: unset + description: The password for the nova service account, used by nova-api. + type: string + hidden: true NeutronPublicInterfaceDefaultRoute: - Default: '' - Description: A custom default route for the NeutronPublicInterface. - Type: String + default: '' + description: A custom default route for the NeutronPublicInterface. + type: string NeutronPublicInterfaceIP: - Default: '' - Description: A custom IP address to put onto the NeutronPublicInterface. - Type: String + default: '' + description: A custom IP address to put onto the NeutronPublicInterface. + type: string NeutronPublicInterfaceRawDevice: - Default: '' - Description: If set, the public interface is a vlan with this device as the raw device. - Type: String + default: '' + description: If set, the public interface is a vlan with this device as the raw device. + type: string NtpServer: - Type: String - Default: '' + type: string + default: '' RabbitUserName: - Default: guest - Description: The username for RabbitMQ - Type: String + default: guest + description: The username for RabbitMQ + type: string RabbitPassword: - Default: guest - Description: The password for RabbitMQ - Type: String - NoEcho: true + default: guest + description: The password for RabbitMQ + type: string + hidden: true RabbitCookieSalt: - Type: String - Default: unset - Description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change. + type: string + default: unset + description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change. HeatStackDomainAdminPassword: - Description: Password for heat_domain_admin user. - Type: String - Default: '' - NoEcho: true + description: Password for heat_domain_admin user. + type: string + default: '' + hidden: true MysqlInnodbBufferPoolSize: - Description: > + description: > Specifies the size of the buffer pool in megabytes. Setting to zero should be interpreted as "no value" and will defer to the lower level default. - Type: Number - Default: 0 + type: number + default: 0 KeystoneCACertificate: - Default: '' - Description: Keystone self-signed certificate authority certificate. - Type: String + default: '' + description: Keystone self-signed certificate authority certificate. + type: string KeystoneSigningCertificate: - Default: '' - Description: Keystone certificate for verifying token validity. - Type: String + default: '' + description: Keystone certificate for verifying token validity. + type: string KeystoneSigningKey: - Default: '' - Description: Keystone key for signing tokens. - Type: String - NoEcho: true -Resources: + default: '' + description: Keystone key for signing tokens. + type: string + hidden: true +resources: RabbitCookie: - Type: OS::Heat::RandomString - Properties: + type: OS::Heat::RandomString + properties: length: 20 salt: - Ref: RabbitCookieSalt + get_param: RabbitCookieSalt undercloudConfig: - Type: OS::Heat::StructuredConfig - Properties: + type: OS::Heat::StructuredConfig + properties: config: completion-signal: {get_input: deploy_signal_id} admin-password: - Ref: AdminPassword + get_param: AdminPassword admin-token: - Ref: AdminToken + get_param: AdminToken bootstrap_host: bootstrap_nodeid: Fn::Select: @@ -207,68 +207,68 @@ Resources: undercloud: - Fn::Select: - name - - Fn::GetAtt: + - get_attr: - undercloud - show nodeid: {get_input: bootstack_nodeid} bootstack: public_interface_ip: - Ref: NeutronPublicInterfaceIP + get_param: NeutronPublicInterfaceIP controller-address: get_input: controller_host ceilometer: db: mysql://ceilometer:unset@localhost/ceilometer - metering_secret: {Ref: CeilometerMeteringSecret} + metering_secret: {get_param: CeilometerMeteringSecret} snmpd_readonly_user_name: - Ref: SnmpdReadonlyUserName + get_param: SnmpdReadonlyUserName snmpd_readonly_user_password: - Ref: SnmpdReadonlyUserPassword + get_param: SnmpdReadonlyUserPassword service-password: - Ref: CeilometerPassword + get_param: CeilometerPassword db-password: unset glance: backend: file db: mysql://glance:unset@localhost/glance host: 127.0.0.1 port: - Ref: GlancePort + get_param: GlancePort protocol: - Ref: GlanceProtocol + get_param: GlanceProtocol service-password: - Ref: GlancePassword + get_param: GlancePassword notifier-strategy: - Ref: GlanceNotifierStrategy + get_param: GlanceNotifierStrategy log-file: - Ref: GlanceLogFile + get_param: GlanceLogFile heat: admin_password: - Ref: HeatPassword + get_param: HeatPassword admin_tenant_name: service admin_user: heat auth_encryption_key: unset___________ db: mysql://heat:unset@localhost/heat - stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword} + stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword} watch_server_url: {get_input: heat.watch_server_url} metadata_server_url: {get_input: heat.metadata_server_url} waitcondition_server_url: {get_input: heat.waitcondition_server_url} keystone: db: mysql://keystone:unset@localhost/keystone host: 127.0.0.1 - ca_certificate: {Ref: KeystoneCACertificate} - signing_key: {Ref: KeystoneSigningKey} - signing_certificate: {Ref: KeystoneSigningCertificate} + ca_certificate: {get_param: KeystoneCACertificate} + signing_key: {get_param: KeystoneSigningKey} + signing_certificate: {get_param: KeystoneSigningCertificate} mysql: - innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize} + innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize} neutron: host: 127.0.0.1 ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8 ovs: public_interface: - Ref: NeutronPublicInterface + get_param: NeutronPublicInterface public_interface_raw_device: - Ref: NeutronPublicInterfaceRawDevice + get_param: NeutronPublicInterfaceRawDevice public_interface_route: - Ref: NeutronPublicInterfaceDefaultRoute + get_param: NeutronPublicInterfaceDefaultRoute physical_bridge: br-ctlplane physical_network: ctlplane network_vlan_ranges: ctlplane @@ -276,48 +276,48 @@ Resources: tenant_network_type: vlan enable_tunneling: 'False' service-password: - Ref: NeutronPassword + get_param: NeutronPassword rabbit: host: 127.0.0.1 username: - Ref: RabbitUserName + get_param: RabbitUserName password: - Ref: RabbitPassword + get_param: RabbitPassword cookie: - Fn::GetAtt: + get_attr: - RabbitCookie - value ntp: servers: - - {server: {Ref: NtpServer}, fudge: "stratum 0"} + - {server: {get_param: NtpServer}, fudge: "stratum 0"} undercloudPassthroughConfig: - Type: OS::Heat::StructuredConfig - Properties: + type: OS::Heat::StructuredConfig + properties: config: {get_input: passthrough_config} undercloud: - Type: OS::Nova::Server - Properties: + type: OS::Nova::Server + properties: image: - Ref: undercloudImage + get_param: undercloudImage flavor: - Ref: Flavor + get_param: Flavor key_name: - Ref: KeyName + get_param: KeyName image_update_policy: - Ref: ImageUpdatePolicy + get_param: ImageUpdatePolicy networks: - network: ctlplane user_data_format: SOFTWARE_CONFIG 99_undercloudDeployment: - Type: OS::Heat::StructuredDeployment - Properties: - config: {Ref: undercloudConfig} - server: {Ref: undercloud} + type: OS::Heat::StructuredDeployment + properties: + config: {get_resource: undercloudConfig} + server: {get_resource: undercloud} input_values: bootstack_nodeid: Fn::Select: - name - - Fn::GetAtt: + - get_attr: - undercloud - show controller_host: @@ -325,32 +325,32 @@ Resources: - 0 - Fn::Select: - ctlplane - - Fn::GetAtt: + - get_attr: - undercloud - networks heat.watch_server_url: - Fn::Join: + list_join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { "Fn::GetAtt": [ undercloud, networks ]}]]} + - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { get_attr: [ undercloud, networks ]}]]} - ':8003' heat.metadata_server_url: - Fn::Join: + list_join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { "Fn::GetAtt": [ undercloud, networks ]}]]} + - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { get_attr: [ undercloud, networks ]}]]} - ':8000' heat.waitcondition_server_url: - Fn::Join: + list_join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { "Fn::GetAtt": [ undercloud, networks ]}]]} + - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { get_attr: [ undercloud, networks ]}]]} - ':8000/v1/waitcondition' 00_undercloudPassthroughDeployment: - Type: OS::Heat::StructuredDeployment - Properties: - config: {Ref: undercloudPassthroughConfig} - server: {Ref: undercloud} + type: OS::Heat::StructuredDeployment + properties: + config: {get_resource: undercloudPassthroughConfig} + server: {get_resource: undercloud} signal_transport: NO_SIGNAL input_values: - passthrough_config: {Ref: ExtraConfig} + passthrough_config: {get_param: ExtraConfig} -- cgit 1.2.3-korg