diff options
Diffstat (limited to 'overcloud-source.yaml')
| -rw-r--r-- | overcloud-source.yaml | 153 |
1 files changed, 135 insertions, 18 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index fe3208d7..cf1eecda 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: | @@ -117,6 +121,15 @@ Parameters: Description: The password for the ceilometer service account. Type: String NoEcho: true + 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 + Type: String + NoEcho: true CloudName: Default: '' Description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org @@ -163,6 +176,10 @@ 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. @@ -213,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: @@ -277,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: @@ -315,7 +365,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: @@ -383,6 +434,12 @@ Resources: metering_secret: {Ref: CeilometerMeteringSecret} service-password: Ref: CeilometerPassword + snmpd: + export_MIB: UCD-SNMP-MIB + readonly_user_name: + Ref: SnmpdReadonlyUserName + readonly_user_password: + Ref: SnmpdReadonlyUserPassword nova: compute_driver: libvirt.LibvirtDriver db: mysql://nova:unset@localhost/nova @@ -407,6 +464,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: @@ -430,7 +496,7 @@ Resources: config: {Ref: controllerConfig} server: {Ref: controller0} input_values: - controller_host: + controller_host: Fn::Select: - 0 - Fn::Select: @@ -458,9 +524,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: |