X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=undercloud-source.yaml;h=ce5b7e8de091fa230c614761eb39fd0cd39bbd26;hb=92377361c76a612457cc147a0608d94db430a771;hp=22a681c8383f36f984989a4b0a25ac8cd69ad4aa;hpb=3757966936867eadd708b5199893ad41937d1f1f;p=apex-tripleo-heat-templates.git diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 22a681c8..ce5b7e8d 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -11,10 +11,6 @@ parameters: 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 BaremetalArch: default: i386 description: The architecture to use in Nova-BM - i386 or amd64. @@ -33,15 +29,12 @@ parameters: default: '' description: Set to True to enable debugging on all services. type: string - SnmpdReadonlyUserName: - 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 + DefaultSignalTransport: + default: CFN_SIGNAL + description: Transport to use for software-config signals. type: string - hidden: true + constraints: + - allowed_values: [ CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL ] ExtraConfig: default: {} description: | @@ -81,9 +74,19 @@ parameters: } type: json Flavor: - default: baremetal description: Flavor to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor + GlanceLogFile: + description: The filepath of the file to use for logging messages from Glance. + type: string + default: '' + GlancePassword: + default: unset + description: The password for the glance service account, used by the glance services. + type: string + hidden: true GlancePort: default: 9292 description: Glance port. @@ -92,61 +95,101 @@ parameters: 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 - hidden: true GlanceNotifierStrategy: 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: '' KeyName: default: default description: Name of an existing EC2 KeyPair to enable SSH access to the instances type: string + KeystoneCACertificate: + default: '' + description: Keystone self-signed certificate authority certificate. + type: string + KeystoneSigningCertificate: + default: '' + description: Keystone certificate for verifying token validity. + type: string + KeystoneSigningKey: + default: '' + description: Keystone key for signing tokens. + type: string + hidden: true + KeystoneSSLCertificate: + default: '' + description: Keystone certificate for verifying token validity. + type: string + KeystoneSSLCertificateKey: + default: '' + description: Keystone key for signing tokens. + type: string + hidden: true HeatPassword: default: unset description: The password for the Heat service account, used by the Heat services. type: string hidden: true + HeatStackDomainAdminPassword: + description: Password for heat_domain_admin user. + type: string + default: '' + hidden: true ImageUpdatePolicy: default: REBUILD_PRESERVE_EPHEMERAL description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt. type: string - undercloudImage: - default: undercloud - type: string + MysqlInnodbBufferPoolSize: + 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 NeutronPassword: 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 - hidden: true NeutronPublicInterfaceDefaultRoute: default: '' description: A custom default route for the NeutronPublicInterface. type: string NeutronPublicInterfaceIP: default: '' - description: A custom IP address to put onto the NeutronPublicInterface. + description: > + A custom IP address to put onto the NeutronPublicInterface bridge. + See also NeutronPublicInterfaceTagIP for adding a VLAN tagging IP. + NeutronPublicInterfaceIP is deprecated in the context of deploying + underclouds - its only needed for the seed bootstrap process. type: string NeutronPublicInterfaceRawDevice: default: '' description: If set, the public interface is a vlan with this device as the raw device. type: string + NeutronPublicInterfaceTag: + default: '' + description: > + VLAN tag for creating a public VLAN. The tag will be used to + create an access port on the exterior bridge, and that port will be + given the IP address returned by neutron from the public network. + type: string + NovaPassword: + default: unset + description: The password for the nova service account, used by nova-api. + type: string + hidden: true + NeutronDVR: + default: 'False' + type: string NtpServer: type: string default: '' + RabbitCookieSalt: + type: string + default: unset + description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change. RabbitUserName: default: guest description: The username for RabbitMQ @@ -156,35 +199,18 @@ parameters: description: The password for RabbitMQ type: string hidden: true - RabbitCookieSalt: + SnmpdReadonlyUserName: + default: ro_snmp_user + description: The user name for SNMPd with readonly rights running on all Overcloud nodes type: string + SnmpdReadonlyUserPassword: 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. + description: The user password for SNMPd with readonly rights running on all Overcloud nodes type: string - default: '' hidden: true - MysqlInnodbBufferPoolSize: - 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 - KeystoneCACertificate: - default: '' - description: Keystone self-signed certificate authority certificate. - type: string - KeystoneSigningCertificate: - default: '' - description: Keystone certificate for verifying token validity. - type: string - KeystoneSigningKey: - default: '' - description: Keystone key for signing tokens. + undercloudImage: + default: undercloud type: string - hidden: true resources: RabbitCookie: type: OS::Heat::RandomString @@ -192,6 +218,10 @@ resources: length: 20 salt: get_param: RabbitCookieSalt + MysqlRootPassword: + type: OS::Heat::RandomString + properties: + length: 10 undercloudConfig: type: OS::Heat::StructuredConfig properties: @@ -209,11 +239,9 @@ resources: - 0 - Merge::Map: undercloud: - - Fn::Select: + - get_attr: + - undercloud - name - - get_attr: - - undercloud - - show nodeid: {get_input: bootstack_nodeid} bootstack: public_interface_ip: @@ -276,19 +304,28 @@ resources: ca_certificate: {get_param: KeystoneCACertificate} signing_key: {get_param: KeystoneSigningKey} signing_certificate: {get_param: KeystoneSigningCertificate} + ssl: + certificate: {get_param: KeystoneSSLCertificate} + certificate_key: {get_param: KeystoneSSLCertificateKey} mysql: innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize} + root-password: {get_resource: MysqlRootPassword} + bind_address: 127.0.0.1 neutron: debug: {get_param: Debug} host: 127.0.0.1 ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8 ovs: + local_ip: + get_input: controller_host public_interface: get_param: NeutronPublicInterface public_interface_raw_device: get_param: NeutronPublicInterfaceRawDevice public_interface_route: get_param: NeutronPublicInterfaceDefaultRoute + public_interface_tag: + get_param: NeutronPublicInterfaceTag physical_bridge: br-ctlplane physical_network: ctlplane network_vlan_ranges: ctlplane @@ -309,7 +346,7 @@ resources: - value ntp: servers: - - {server: {get_param: NtpServer}, fudge: "stratum 0"} + - {server: {get_param: NtpServer}} undercloudPassthroughConfig: type: OS::Heat::StructuredConfig properties: @@ -328,16 +365,17 @@ resources: networks: - network: ctlplane user_data_format: SOFTWARE_CONFIG - 99_undercloudDeployment: + undercloudDeployment: + depends_on: [undercloudPassthroughDeployment] type: OS::Heat::StructuredDeployment properties: config: {get_resource: undercloudConfig} server: {get_resource: undercloud} + signal_transport: {get_param: DefaultSignalTransport} input_values: bootstack_nodeid: get_attr: - undercloud - - show - name controller_host: get_attr: @@ -363,7 +401,8 @@ resources: - - 'http://' - {get_attr: [undercloud, networks, ctlplane, 0]} - ':8000/v1/waitcondition' - 00_undercloudPassthroughDeployment: + undercloudPassthroughDeployment: + depends_on: [undercloudNovaDeployment] type: OS::Heat::StructuredDeployment properties: config: {get_resource: undercloudPassthroughConfig}