X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=overcloud-source.yaml;h=950b39a5c6936551e89d3c53a289da3ad969f48a;hb=a830cea3b1071f70485f427877ac4577f5d13e16;hp=7fd7505f4fbdc5d5b14bf19a8418640fa34472d1;hpb=f0e61d11fc949cb9ebc3d2b875fdb79335ed0d33;p=apex-tripleo-heat-templates.git diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 7fd7505f..950b39a5 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -17,22 +17,38 @@ Parameters: Description: The password for the cinder service account, used by cinder-api. Type: String NoEcho: true - Flavor: + CinderISCSIHelper: + Default: tgtadm + Description: The iSCSI helper to use with cinder. + Type: String + OvercloudControlFlavor: + Default: baremetal + Description: Flavor for control nodes to request when deploying. + Type: String + OvercloudComputeFlavor: Default: baremetal - Description: Flavor to request when deploying. + Description: Flavor for compute nodes to request when deploying. Type: String GlancePassword: Default: unset Description: The password for the glance service account, used by the glance services. Type: String NoEcho: 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: '' HeatPassword: Default: unset Description: The password for the Heat service account, used by the Heat services. Type: String NoEcho: true ImageUpdatePolicy: - Default: 'REPLACE' + Default: 'REBUILD_PRESERVE_EPHEMERAL' Description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt. Type: String KeyName: @@ -63,6 +79,10 @@ Parameters: Description: The password for the ceilometer service account. Type: String NoEcho: true + CloudName: + Default: '' + Description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org + Type: String NovaComputeDriver: Default: libvirt.LibvirtDriver Type: String @@ -105,18 +125,67 @@ Parameters: Default: '' Description: If set, the public interface is a vlan with this device as the raw device. Type: String - notcomputeImage: + controllerImage: Type: String Default: overcloud-control NtpServer: Type: String Default: '' + RabbitUserName: + Default: guest + Description: The username for RabbitMQ + Type: String + RabbitPassword: + Default: guest + Description: The password for RabbitMQ + Type: String + NoEcho: true + RabbitCookieSalt: + 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 + LiveUpdateUserName: + Type: String + Description: The live-update username for the undercloud Glance API. + Default: '' + LiveUpdateTenantName: + Type: String + Description: The live-update tenant name for the undercloud Glance API. + Default: '' + LiveUpdateHost: + Type: String + Description: The IP address for the undercloud Glance API. + Default: '' + LiveUpdatePassword: + Type: String + Default: '' + Description: The live-update password for the undercloud Glance API. + NoEcho: true + LiveUpdateComputeImage: + Type: String + Description: The image ID for live-updates to the overcloud compute nodes. + Default: '' + MysqlInnodbBufferPoolSize: + Description: Specifies the size of the buffer pool in megabytes. + Type: Number + Default: 100 Resources: + RabbitCookie: + Type: OS::Heat::RandomString + Properties: + length: 20 + salt: + Ref: RabbitCookieSalt AccessPolicy: Properties: AllowedResources: - - notCompute0 - - notCompute0Config + - controller0 + - controller0Config Type: OS::Heat::AccessPolicy ComputeAccessPolicy: Properties: @@ -124,19 +193,19 @@ Resources: - NovaCompute0 - NovaCompute0Config Type: OS::Heat::AccessPolicy - notCompute0Key: + controller0Key: Properties: UserName: Ref: User Type: AWS::IAM::AccessKey - notCompute0CompletionCondition: + controller0CompletionCondition: Type: AWS::CloudFormation::WaitCondition - DependsOn: notCompute0 + DependsOn: controller0Config Properties: - Handle: {Ref: notCompute0CompletionHandle} + Handle: {Ref: controller0CompletionHandle} Count: '1' Timeout: '1800' - notCompute0CompletionHandle: + controller0CompletionHandle: Type: OS::Heat::UpdateWaitConditionHandle NovaCompute0Key: Type: FileInclude @@ -160,14 +229,14 @@ Resources: Path: nova-compute-instance.yaml SubKey: Resources.NovaCompute0Config Parameters: - NovaApiHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } - KeystoneHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } - RabbitHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } - NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } - GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } - NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/nova']]} - CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/ceilometer']]} - NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/neutron']]} + NovaApiHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } + KeystoneHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } + RabbitHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } + NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } + GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } + NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ]}, '/nova']]} + CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ]}, '/ceilometer']]} + NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ]}, '/neutron']]} NeutronNetworkType: "gre" NeutronEnableTunnelling: "True" NeutronFlatNetworks: @@ -179,7 +248,47 @@ Resources: Ref: HypervisorNeutronPublicInterface NeutronBridgeMappings: Ref: NeutronBridgeMappings - RabbitPassword: "guest" + StaticHosts: + Fn::Join: + - "\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: + - ' ' + - - Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - controller0 + - networks + - {Ref: CloudName} + # If CloudName is unset, make the hosts line still valid + - unused NovaCompute0: Type: FileInclude Path: nova-compute-instance.yaml @@ -189,7 +298,7 @@ Resources: Policies: - Ref: AccessPolicy Type: AWS::IAM::User - notCompute0Config: + controller0Config: Type: AWS::AutoScaling::LaunchConfiguration Properties: ImageId: '0' @@ -213,15 +322,17 @@ Resources: volume_size_mb: '5000' service-password: Ref: CinderPassword + iscsi-helper: + Ref: CinderISCSIHelper completion-handle: - Ref: notCompute0CompletionHandle + Ref: controller0CompletionHandle controller-address: Fn::Select: - 0 - Fn::Select: - 'ctlplane' - Fn::GetAtt: - - notCompute0 + - controller0 - networks db-password: unset glance: @@ -233,13 +344,17 @@ Resources: - Fn::Select: - 'ctlplane' - Fn::GetAtt: - - notCompute0 + - controller0 - networks service-password: Ref: GlancePassword swift-store-user: service:glance swift-store-key: Ref: GlancePassword + notifier-strategy: + Ref: GlanceNotifierStrategy + log-file: + Ref: GlanceLogFile heat: admin_password: Ref: HeatPassword @@ -247,6 +362,7 @@ Resources: admin_user: heat auth_encryption_key: unset___________ db: mysql://heat:unset@localhost/heat + stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword} watch_server_url: Fn::Join: - '' @@ -256,7 +372,7 @@ Resources: - Fn::Select: - 'ctlplane' - Fn::GetAtt: - - notCompute0 + - controller0 - networks - ':8003' metadata_server_url: @@ -268,7 +384,7 @@ Resources: - Fn::Select: - 'ctlplane' - Fn::GetAtt: - - notCompute0 + - controller0 - networks - ':8000' waitcondition_server_url: @@ -280,9 +396,20 @@ Resources: - Fn::Select: - 'ctlplane' - Fn::GetAtt: - - notCompute0 + - controller0 - networks - ':8000/v1/waitcondition' + hosts: + Fn::Join: + - ' ' + - - Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - controller0 + - networks + - {Ref: CloudName} keystone: db: mysql://keystone:unset@localhost/keystone host: @@ -291,8 +418,10 @@ Resources: - Fn::Select: - 'ctlplane' - Fn::GetAtt: - - notCompute0 + - controller0 - networks + mysql: + innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize} neutron: flat-networks: {Ref: NeutronFlatNetworks} host: @@ -301,7 +430,7 @@ Resources: - Fn::Select: - ctlplane - Fn::GetAtt: - - notCompute0 + - controller0 - networks metadata_proxy_shared_secret: unset ovs: @@ -312,7 +441,7 @@ Resources: - Fn::Select: - ctlplane - Fn::GetAtt: - - notCompute0 + - controller0 - networks bridge_mappings: {Ref: NeutronBridgeMappings} public_interface: @@ -342,7 +471,7 @@ Resources: - Fn::Select: - 'ctlplane' - Fn::GetAtt: - - notCompute0 + - controller0 - networks metadata-proxy: true service-password: @@ -350,11 +479,11 @@ Resources: os-collect-config: cfn: access_key_id: - Ref: notCompute0Key - path: notCompute0Config.Metadata + Ref: controller0Key + path: controller0Config.Metadata secret_access_key: Fn::GetAtt: - - notCompute0Key + - controller0Key - SecretAccessKey stack_name: Ref: AWS::StackName @@ -365,32 +494,39 @@ Resources: - Fn::Select: - ctlplane - Fn::GetAtt: - - notCompute0 + - controller0 - networks - password: guest + username: + Ref: RabbitUserName + password: + Ref: RabbitPassword + cookie: + Fn::GetAtt: + - RabbitCookie + - value ntp: servers: - {server: {Ref: NtpServer}, fudge: "stratum 0"} - notCompute0: + controller0: Type: OS::Nova::Server Properties: image: - Ref: notcomputeImage + Ref: controllerImage image_update_policy: Ref: ImageUpdatePolicy flavor: - Ref: Flavor + Ref: OvercloudControlFlavor key_name: Ref: KeyName Metadata: os-collect-config: cfn: access_key_id: - Ref: notCompute0Key - path: notCompute0Config.Metadata + Ref: controller0Key + path: controller0Config.Metadata secret_access_key: Fn::GetAtt: - - notCompute0Key + - controller0Key - SecretAccessKey stack_name: Ref: AWS::StackName @@ -406,6 +542,6 @@ Outputs: - Fn::Select: - ctlplane - Fn::GetAtt: - - notCompute0 + - controller0 - networks - :5000/v2.0/