diff options
| -rw-r--r-- | block-storage.yaml | 6 | ||||
| -rw-r--r-- | overcloud-source.yaml | 142 | ||||
| -rw-r--r-- | undercloud-bm-source.yaml | 7 | ||||
| -rw-r--r-- | undercloud-source.yaml | 14 | ||||
| -rw-r--r-- | undercloud-vm-source.yaml | 7 |
5 files changed, 152 insertions, 24 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index ce60ce26..9cc92fe1 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -40,7 +40,8 @@ Resources: host: {get_input: controller_host} cinder: db: {get_input: cinder_dsn} - volume_size_mb: '5000' + volume_size_mb: + Ref: CinderLVMLoopDeviceSize service-password: Ref: CinderPassword iscsi-helper: @@ -64,7 +65,8 @@ Resources: host: {get_input: controller_host} cinder: db: {get_input: cinder_dsn} - volume_size_mb: '5000' + volume_size_mb: + Ref: CinderLVMLoopDeviceSize service-password: Ref: CinderPassword iscsi-helper: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 7a1780a7..d17042ae 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -21,6 +21,10 @@ Parameters: Default: tgtadm Description: The iSCSI helper to use with cinder. Type: String + CinderLVMLoopDeviceSize: + Default: 5000 + Description: The size of the loopback file used by the cinder LVM driver. + Type: Number ExtraConfig: Default: {} Description: | @@ -172,6 +176,14 @@ Parameters: Default: '' Description: If set, the public interface is a vlan with this device as the raw device. Type: String + NeutronControlPlaneID: + Default: '' + Type: String + Description: Neutron ID for ctlplane network. + NeutronDnsmasqOptions: + Default: 'dhcp-option-force=26,1400' + Description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the gre tunnel overhead. + Type: String controllerImage: Type: String Default: overcloud-control @@ -218,10 +230,28 @@ Parameters: Description: The image ID for live-updates to the overcloud compute nodes. Default: '' MysqlInnodbBufferPoolSize: - Description: Specifies the size of the buffer pool in megabytes. + 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: 100 + Default: 0 + ControlVirtualInterface: + Default: 'br-ex' + Description: Interface where virtual ip will be assigned. + Type: String + ControlFixedIPs: + Default: [] + Description: Should be used for arbitrary ips. + Type: Json Resources: + ControlVirtualIP: + Type: OS::Neutron::Port + Properties: + name: control_virtual_ip + network_id: {Ref: NeutronControlPlaneID} + fixed_ips: + Ref: ControlFixedIPs RabbitCookie: Type: OS::Heat::RandomString Properties: @@ -282,17 +312,32 @@ Resources: - show - 'novalocal' - Fn::Join: - - ' ' - - - Fn::Select: - - 0 - - Fn::Select: - - ctlplane - - Fn::GetAtt: - - controller0 - - networks - - {Ref: CloudName} - # If CloudName is unset, make the hosts line still valid - - unused + - "\n" + - Merge::Map: + controller0: + Fn::Join: + - ' ' + - - Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - controller0 + - networks + - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - Fn::Join: + - '.' + - - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - 'novalocal' + - {Ref: CloudName} NovaCompute0Passthrough: Type: OS::Heat::StructuredDeployment Properties: @@ -319,7 +364,8 @@ Resources: Ref: NeutronPublicInterfaceIP cinder: db: mysql://cinder:unset@localhost/cinder - volume_size_mb: '5000' + volume_size_mb: + Ref: CinderLVMLoopDeviceSize service-password: Ref: CinderPassword iscsi-helper: @@ -380,6 +426,8 @@ Resources: ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8 service-password: Ref: NeutronPassword + dnsmasq-options: + Ref: NeutronDnsmasqOptions ceilometer: db: mysql://ceilometer:unset@localhost/ceilometer metering_secret: {Ref: CeilometerMeteringSecret} @@ -415,6 +463,15 @@ Resources: ntp: servers: - {server: {Ref: NtpServer}, fudge: "stratum 0"} + keepalived: + keepalive_interface: + Ref: NeutronPublicInterface + priority: 101 + virtual_ips: + - + ip: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} + interface: + Ref: ControlVirtualInterface controllerPassthrough: Type: OS::Heat::StructuredConfig Properties: @@ -465,9 +522,60 @@ Resources: - ':8000/v1/waitcondition' hosts: Fn::Join: - - ' ' - - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { "Fn::GetAtt": [ controller0, networks ]}]]} - - {Ref: CloudName} + - "\n" + - - Fn::Join: + - "\n" + - Merge::Map: + NovaCompute0: + Fn::Join: + - ' ' + - - Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - NovaCompute0 + - networks + - Fn::Select: + - name + - Fn::GetAtt: + - NovaCompute0 + - show + - Fn::Join: + - '.' + - - Fn::Select: + - name + - Fn::GetAtt: + - NovaCompute0 + - show + - 'novalocal' + - Fn::Join: + - "\n" + - Merge::Map: + controller0: + Fn::Join: + - ' ' + - - Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - controller0 + - networks + - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - Fn::Join: + - '.' + - - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - 'novalocal' + - {Ref: CloudName} controller0SSLDeployment: Type: OS::Heat::StructuredDeployment Properties: diff --git a/undercloud-bm-source.yaml b/undercloud-bm-source.yaml index ff00d28c..a1c0b98a 100644 --- a/undercloud-bm-source.yaml +++ b/undercloud-bm-source.yaml @@ -7,6 +7,10 @@ Parameters: Default: nova.virt.baremetal.ipmi.IPMI Description: Bare metal power manager driver. Type: String + PxeDeployTimeout: + Default: 2400 + Description: Timeout for PXE deployment of baremetal nodes + Type: Number Resources: undercloudConfig: Type: AWS::AutoScaling::LaunchConfiguration @@ -27,6 +31,7 @@ Resources: db: mysql://nova:unset@localhost/nova_bm power_manager: Ref: PowerManager - pxe_deploy_timeout: 2400 + pxe_deploy_timeout: + Ref: PxeDeployTimeout service-password: Ref: NovaPassword diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 2b240415..3cddb262 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -11,6 +11,10 @@ Parameters: Description: The keystone auth secret. Type: String NoEcho: 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. @@ -100,9 +104,12 @@ Parameters: Default: '' NoEcho: true MysqlInnodbBufferPoolSize: - Description: Specifies the size of the buffer pool in megabytes. + 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: 100 + Default: 0 Resources: RabbitCookie: Type: OS::Heat::RandomString @@ -166,7 +173,8 @@ Resources: Ref: CeilometerPassword cinder: db: mysql://cinder:unset@localhost/cinder - volume_size_mb: '5000' + volume_size_mb: + Ref: CinderLVMLoopDeviceSize completion-handle: Ref: controller0CompletionHandle db-password: unset diff --git a/undercloud-vm-source.yaml b/undercloud-vm-source.yaml index 48a6fffd..4e076fd3 100644 --- a/undercloud-vm-source.yaml +++ b/undercloud-vm-source.yaml @@ -7,6 +7,10 @@ Parameters: Default: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager Description: Bare metal power manager driver. Type: String + PxeDeployTimeout: + Default: 2400 + Description: Timeout for PXE deployment of baremetal nodes + Type: Number PowerSSHHost: Default: 192.168.122.1 Description: SSH host to ssh to for power management operations. @@ -39,7 +43,8 @@ Resources: db: mysql://nova:unset@localhost/nova_bm power_manager: Ref: PowerManager - pxe_deploy_timeout: 2400 + pxe_deploy_timeout: + Ref: PxeDeployTimeout virtual_power: user: Ref: PowerUserName |