diff options
| -rw-r--r-- | cinder-storage.yaml | 60 | ||||
| -rw-r--r-- | compute-config.yaml | 13 | ||||
| -rw-r--r-- | compute.yaml | 57 | ||||
| -rw-r--r-- | controller.yaml | 62 | ||||
| -rw-r--r-- | nova-compute-config.yaml | 7 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 27 | ||||
| -rw-r--r-- | overcloud-source.yaml | 30 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 92 |
8 files changed, 165 insertions, 183 deletions
diff --git a/cinder-storage.yaml b/cinder-storage.yaml index b4168586..b30dcdb6 100644 --- a/cinder-storage.yaml +++ b/cinder-storage.yaml @@ -20,7 +20,7 @@ parameters: description: The password for the cinder service account, used by cinder-api. hidden: true type: string - ControllerIP: + VirtualIP: default: '' type: string ExtraConfig: @@ -74,18 +74,6 @@ parameters: default: default description: Name of an existing EC2 KeyPair to enable SSH access to the instances type: string - NeutronEnableTunnelling: - default: "True" - type: string - NeutronNetworkType: - default: gre - type: string - NeutronPassword: - default: '' - type: string - NeutronPublicInterface: - default: eth0 - type: string RabbitPassword: default: '' type: string @@ -101,7 +89,6 @@ parameters: description: The user password for SNMPd with readonly rights running on all Overcloud nodes type: string hidden: true - resources: BlockStorage: type: OS::Nova::Server @@ -119,9 +106,8 @@ resources: server: {get_resource: BlockStorage} config: {get_resource: BlockStorageConfig} input_values: - controller_host: {get_param: ControllerIP} - cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_param: ControllerIP} , '/cinder']]} - neutron_local_ip: {get_attr: [BlockStorage , networks, ctlplane, 0]} + controller_virtual_ip: {get_param: VirtualIP} + cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_param: VirtualIP} , '/cinder']]} snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName} snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} signal_transport: NO_SIGNAL @@ -132,7 +118,7 @@ resources: config: admin-password: {get_param: AdminPassword} keystone: - host: {get_input: controller_host} + host: {get_input: controller_virtual_ip} cinder: db: {get_input: cinder_dsn} volume_size_mb: @@ -146,46 +132,12 @@ resources: readonly_user_name: {get_input: snmpd_readonly_user_name} readonly_user_password: {get_input: snmpd_readonly_user_password} rabbit: - host: {get_input: controller_host} + host: {get_input: controller_virtual_ip} username: {get_param: RabbitUserName} password: {get_param: RabbitPassword} glance: - host: {get_input: controller_host} + host: {get_input: controller_virtual_ip} port: {get_param: GlancePort} - interfaces: - control: {get_param: NeutronPublicInterface} - neutron: - ovs: - local_ip: {get_input: neutron_local_ip} - tenant_network_type: {get_param: NeutronNetworkType} - enable_tunneling: {get_param: NeutronEnableTunnelling} - service-password: - get_param: NeutronPassword - config: - keystone: - host: {get_input: controller_host} - cinder: - db: {get_input: cinder_dsn} - volume_size_mb: - get_param: CinderLVMLoopDeviceSize - service-password: - get_param: CinderPassword - iscsi-helper: - get_param: CinderISCSIHelper - admin-password: {get_param: AdminPassword} - rabbit: - host: {get_input: controller_host} - username: {get_param: RabbitUserName} - password: {get_param: RabbitPassword} - interfaces: - control: {get_param: NeutronPublicInterface} - neutron: - ovs: - local_ip: { get_input: neutron_local_ip } - tenant_network_type: {get_param: NeutronNetworkType} - enable_tunneling: {get_param: NeutronEnableTunnelling} - service-password: - get_param: NeutronPassword outputs: hosts_entry: value: diff --git a/compute-config.yaml b/compute-config.yaml index 4d1e3cec..a5bfab34 100644 --- a/compute-config.yaml +++ b/compute-config.yaml @@ -39,7 +39,12 @@ resources: debug: {get_input: debug} flat-networks: {get_input: neutron_flat_networks} host: {get_input: neutron_host} + router_distributed: {get_input: neutron_router_distributed} + agent_mode: {get_input: neutron_agent_mode} ovs_db: {get_input: neutron_dsn} + metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret} + mechanism_drivers: {get_input: neutron_mechanism_drivers} + allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover} ovs: local_ip: {get_input: neutron_local_ip} tenant_network_type: {get_input: neutron_tenant_network_type} @@ -49,19 +54,13 @@ resources: enable_tunneling: {get_input: neutron_enable_tunneling} physical_bridge: {get_input: neutron_physical_bridge} public_interface: {get_input: neutron_public_interface} + public_interface_raw_device: {get_input: neutron_public_interface_raw_device} service-password: {get_input: neutron_password} admin-password: {get_input: admin_password} rabbit: host: {get_input: rabbit_host} username: {get_input: rabbit_username} password: {get_input: rabbit_password} - live-update: - host: {get_input: live_update_host} - username: {get_input: live_update_username} - password: {get_input: live_update_password} - tenant-name: {get_input: live_update_tenant_name} - base_image_id: {get_input: nova_image} - live_update_image_id: {get_input: live_update_compute_image} ntp: servers: - {server: {get_input: ntp_server}, fudge: "stratum 0"} diff --git a/compute.yaml b/compute.yaml index e2340b83..c93bd627 100644 --- a/compute.yaml +++ b/compute.yaml @@ -103,27 +103,6 @@ parameters: KeystoneHost: type: string default: '' - LiveUpdateComputeImage: - type: string - description: The image ID for live-updates to the overcloud compute nodes. - 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. - hidden: true - LiveUpdateTenantName: - type: string - description: The live-update tenant name for the undercloud Glance API. - default: '' - LiveUpdateUserName: - type: string - description: The live-update username for the undercloud Glance API. - default: '' NeutronBridgeMappings: description: > The OVS logical->physical bridge mappings to use. See the Neutron @@ -177,6 +156,30 @@ parameters: The tunnel types for the Neutron tenant network. To specify multiple values, use a comma separated string, like so: 'gre,vxlan' default: 'gre' + NeutronPublicInterfaceRawDevice: + default: '' + type: string + NeutronDVR: + default: 'False' + type: string + NeutronMetadataProxySharedSecret: + default: 'unset' + description: Shared secret to prevent spoofing + type: string + NeutronMechanismDrivers: + default: 'openvswitch' + description: | + The mechanism drivers for the Neutron tenant network. To specify multiple + values, use a comma separated string, like so: 'openvswitch,l2_population' + type: string + NeutronAllowL3AgentFailover: + default: 'True' + description: Allow automatic l3-agent failover + type: string + NeutronAgentMode: + default: 'dvr_snat' + description: Agent mode for the neutron-l3-agent on the controller hosts + type: string NovaApiHost: type: string default: '' # Has to be here because of the ignored empty value bug @@ -282,16 +285,16 @@ resources: neutron_physical_bridge: {get_param: NeutronPhysicalBridge} neutron_public_interface: {get_param: NeutronPublicInterface} neutron_password: {get_param: NeutronPassword} + neutron_agent_mode: {get_param: NeutronAgentMode} + neutron_router_distributed: {get_param: NeutronDVR} + neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} + neutron_mechanism_drivers: {get_param: NeutronMechanismDrivers} + neutron_allow_l3agent_failover: {get_param: NeutronAllowL3AgentFailover} + neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice} admin_password: {get_param: AdminPassword} rabbit_host: {get_param: RabbitHost} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} - live_update_host: {get_param: LiveUpdateHost} - live_update_username: {get_param: LiveUpdateUserName} - live_update_password: {get_param: LiveUpdatePassword} - live_update_tenant_name: {get_param: LiveUpdateTenantName} - nova_image: {get_param: Image} - live_update_image_id: {get_param: LiveUpdateComputeImage} ntp_server: {get_param: NtpServer} NovaComputePassthrough: diff --git a/controller.yaml b/controller.yaml index 6acf232f..0e99cb04 100644 --- a/controller.yaml +++ b/controller.yaml @@ -157,6 +157,15 @@ parameters: 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 MysqlClusterUniquePart: description: A unique identifier of the MySQL cluster the controller is in. type: string @@ -188,6 +197,28 @@ parameters: 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 + NeutronAgentMode: + default: 'dvr_snat' + description: Agent mode for the neutron-l3-agent on the controller hosts + type: string + NeutronDVR: + default: 'False' + description: Whether to configure Neutron Distributed Virtual Routers + type: string + NeutronMetadataProxySharedSecret: + default: 'unset' + description: Shared secret to prevent spoofing + type: string + NeutronMechanismDrivers: + default: 'openvswitch' + description: | + The mechanism drivers for the Neutron tenant network. To specify multiple + values, use a comma separated string, like so: 'openvswitch,l2_population' + type: string + NeutronAllowL3AgentFailover: + default: 'True' + description: Allow automatic l3-agent failover + type: string NeutronEnableTunnelling: type: string default: "True" @@ -273,6 +304,16 @@ parameters: default: guest description: The username for RabbitMQ type: string + RabbitClientUseSSL: + default: false + description: > + Rabbit client subscriber parameter to specify + an SSL connection to the RabbitMQ host. + type: string + RabbitClientPort: + default: 5672 + description: Set rabbit subscriber port, change this if using SSL + type: number SnmpdReadonlyUserName: default: ro_snmp_user description: The user name for SNMPd with readonly rights running on all Overcloud nodes @@ -415,6 +456,9 @@ 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} local_bind: true @@ -428,7 +472,11 @@ resources: debug: {get_param: Debug} flat-networks: {get_param: NeutronFlatNetworks} host: {get_input: controller_virtual_ip} - metadata_proxy_shared_secret: unset + metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} + agent_mode: {get_param: NeutronAgentMode} + router_distributed: {get_param: NeutronDVR} + mechanism_drivers: {get_param: NeutronMechanismDrivers} + allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover} ovs: enable_tunneling: {get_input: neutron_enable_tunneling} local_ip: {get_input: controller_host} @@ -481,6 +529,8 @@ resources: username: {get_param: RabbitUserName} password: {get_param: RabbitPassword} cookie: {get_param: RabbitCookie} + rabbit_client_use_ssl: {get_param: RabbitClientUseSSL} + rabbit_port: {get_param: RabbitClientPort} ntp: servers: - {server: {get_param: NtpServer}, fudge: "stratum 0"} @@ -518,6 +568,8 @@ resources: haproxy: net_binds: - ip: {get_param: VirtualIP} + options: + - option httpchk GET / services: - name: keystone_admin port: 35357 @@ -542,6 +594,7 @@ resources: - name: glance_registry port: 9191 net_binds: *public_binds + options: # overwrite options as glace_reg needs auth for http req - name: heat_api port: 8004 net_binds: *public_binds @@ -566,17 +619,24 @@ resources: - name: nova_metadata port: 8775 net_binds: *public_binds + - name: nova_novncproxy + port: 6080 + net_binds: *public_binds - name: ceilometer port: 8777 net_binds: *public_binds + options: # overwrite options as ceil needs auth for http req - name: swift_proxy_server port: 8080 net_binds: *public_binds + options: + - option httpchk GET /info - name: rabbitmq port: 5672 options: - timeout client 0 - timeout server 0 + - maxconn 1500 ControllerPassthroughConfig: type: OS::Heat::StructuredConfig diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index 8ba778bc..a7708a2e 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -56,13 +56,6 @@ resources: host: {get_input: rabbit_host} username: {get_input: rabbit_username} password: {get_input: rabbit_password} - live-update: - host: {get_input: live_update_host} - username: {get_input: live_update_username} - password: {get_input: live_update_password} - tenant-name: {get_input: live_update_tenant_name} - base_image_id: {get_input: nova_image} - live_update_image_id: {get_input: live_update_compute_image} ntp: servers: - {server: {get_input: ntp_server}, fudge: "stratum 0"} diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 6031fa5d..2d8168a8 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -91,27 +91,6 @@ parameters: default: default KeystoneHost: type: string - LiveUpdateComputeImage: - type: string - description: The image ID for live-updates to the overcloud compute nodes. - 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. - hidden: true - LiveUpdateTenantName: - type: string - description: The live-update tenant name for the undercloud Glance API. - default: '' - LiveUpdateUserName: - type: string - description: The live-update username for the undercloud Glance API. - default: '' NeutronBridgeMappings: type: string NeutronDSN: @@ -268,12 +247,6 @@ resources: rabbit_host: {get_param: RabbitHost} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} - live_update_host: {get_param: LiveUpdateHost} - live_update_username: {get_param: LiveUpdateUserName} - live_update_password: {get_param: LiveUpdatePassword} - live_update_tenant_name: {get_param: LiveUpdateTenantName} - nova_image: {get_param: NovaImage} - live_update_image_id: {get_param: LiveUpdateComputeImage} ntp_server: {get_param: NtpServer} NovaCompute0AllNodesDeployment: depends_on: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 9fd455a0..5084e386 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -186,27 +186,6 @@ parameters: description: Keystone key for signing tokens. type: string hidden: true - LiveUpdateComputeImage: - type: string - description: The image ID for live-updates to the overcloud compute nodes. - 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. - hidden: true - LiveUpdateTenantName: - type: string - description: The live-update tenant name for the undercloud Glance API. - default: '' - LiveUpdateUserName: - type: string - description: The live-update username for the undercloud Glance API. - default: '' MysqlInnodbBufferPoolSize: description: > Specifies the size of the buffer pool in megabytes. Setting to @@ -280,10 +259,6 @@ parameters: overcloud.yaml to include the deployment of VLAN ports to the control plane. type: string - NeutronPublicInterfaceRawDevice: - default: '' - description: If set, the public interface is a vlan with this device as the raw device. - type: string NeutronComputeAgentMode: default: 'dvr' description: Agent mode for the neutron-l3-agent on the compute hosts @@ -300,10 +275,6 @@ parameters: default: 'unset' description: Shared secret to prevent spoofing type: string - NeutronNetworkType: - default: 'gre' - description: The tenant network type for Neutron, either gre or vxlan. - type: string NeutronTunnelTypes: default: 'gre' description: | @@ -833,6 +804,7 @@ resources: options: - timeout client 0 - timeout server 0 + - maxconn 1500 controllerPassthrough: type: OS::Heat::StructuredConfig properties: diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 93ff78d0..ae61ec4b 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -107,12 +107,38 @@ parameters: overcloud.yaml to include the deployment of VLAN ports to the control plane. type: string + NeutronComputeAgentMode: + default: 'dvr' + description: Agent mode for the neutron-l3-agent on the compute hosts + type: string + NeutronAgentMode: + default: 'dvr_snat' + description: Agent mode for the neutron-l3-agent on the controller hosts + type: string + NeutronDVR: + default: 'False' + description: Whether to configure Neutron Distributed Virtual Routers + type: string + NeutronMetadataProxySharedSecret: + default: 'unset' + description: Shared secret to prevent spoofing + type: string NeutronTunnelTypes: default: 'gre' description: | The tunnel types for the Neutron tenant network. To specify multiple values, use a comma separated string, like so: 'gre,vxlan' type: string + NeutronMechanismDrivers: + default: 'openvswitch' + description: | + The mechanism drivers for the Neutron tenant network. To specify multiple + values, use a comma separated string, like so: 'openvswitch,l2_population' + type: string + NeutronAllowL3AgentFailover: + default: 'True' + description: Allow automatic l3-agent failover + type: string NovaPassword: default: unset description: The password for the nova service account, used by nova-api. @@ -145,6 +171,16 @@ parameters: description: The password for RabbitMQ type: string hidden: true + RabbitClientUseSSL: + default: false + description: > + Rabbit client subscriber parameter to specify + an SSL connection to the RabbitMQ host. + type: string + RabbitClientPort: + default: 5672 + description: Set rabbit subscriber port, change this if using SSL + type: number SnmpdReadonlyUserName: default: ro_snmp_user description: The user name for SNMPd with readonly rights running on all Overcloud nodes @@ -272,6 +308,15 @@ parameters: 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 MysqlInnodbBufferPoolSize: description: > Specifies the size of the buffer pool in megabytes. Setting to @@ -355,27 +400,6 @@ parameters: default: 'eth0' description: What interface to add to the HypervisorNeutronPhysicalBridge. type: string - LiveUpdateComputeImage: - type: string - description: The image ID for live-updates to the overcloud compute nodes. - 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. - hidden: true - LiveUpdateTenantName: - type: string - description: The live-update tenant name for the undercloud Glance API. - default: '' - LiveUpdateUserName: - type: string - description: The live-update username for the undercloud Glance API. - default: '' NeutronNetworkVLANRanges: default: 'datacentre' description: > @@ -466,6 +490,8 @@ resources: KeystoneCACertificate: {get_param: KeystoneCACertificate} KeystoneSigningCertificate: {get_param: KeystoneSigningCertificate} KeystoneSigningKey: {get_param: KeystoneSigningKey} + KeystoneSSLCertificate: {get_param: KeystoneSSLCertificate} + KeystoneSSLCertificateKey: {get_param: KeystoneSSLCertificateKey} MysqlClusterUniquePart: {get_attr: [MysqlClusterUniquePart, value]} MysqlInnodbBufferPoolSize: {get_param: MysqlInnodbBufferPoolSize} MysqlRootPassword: {get_attr: [MysqlRootPassword, value]} @@ -478,12 +504,19 @@ resources: NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice} NeutronPassword: {get_param: NeutronPassword} NeutronDnsmasqOptions: {get_param: NeutronDnsmasqOptions} + NeutronDVR: {get_param: NeutronDVR} + NeutronMetadataProxySharedSecret: {get_param: NeutronMetadataProxySharedSecret} + NeutronAgentMode: {get_param: NeutronAgentMode} + NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers} + NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover} NovaPassword: {get_param: NovaPassword} NtpServer: {get_param: NtpServer} PublicVirtualInterface: {get_param: PublicVirtualInterface} RabbitUserName: {get_param: RabbitUserName} RabbitPassword: {get_param: RabbitPassword} RabbitCookie: {get_attr: [RabbitCookie, value]} + RabbitClientUseSSL: {get_param: RabbitClientUseSSL} + RabbitClientPort: {get_param: RabbitClientPort} SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName} SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword} SSLCertificate: {get_param: SSLCertificate} @@ -516,11 +549,6 @@ resources: ImageUpdatePolicy: {get_param: ImageUpdatePolicy} KeyName: {get_param: KeyName} KeystoneHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - LiveUpdateComputeImage: {get_param: LiveUpdateComputeImage} - LiveUpdateHost: {get_param: LiveUpdateHost} - LiveUpdatePassword: {get_param: LiveUpdatePassword} - LiveUpdateTenantName: {get_param: LiveUpdateTenantName} - LiveUpdateUserName: {get_param: LiveUpdateUserName} NeutronBridgeMappings: {get_param: NeutronBridgeMappings} NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling} NeutronFlatNetworks: {get_param: NeutronFlatNetworks} @@ -531,6 +559,12 @@ resources: NeutronPassword: {get_param: NeutronPassword} NeutronPhysicalBridge: {get_param: HypervisorNeutronPhysicalBridge} NeutronPublicInterface: {get_param: HypervisorNeutronPublicInterface} + NeutronDVR: {get_param: NeutronDVR} + NeutronMetadataProxySharedSecret: {get_param: NeutronMetadataProxySharedSecret} + NeutronAgentMode: {get_param: NeutronComputeAgentMode} + NeutronPublicInterfaceRawDevice: {get_param: NeutronPublicInterfaceRawDevice} + NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers} + NeutronAllowL3AgentFailover: {get_param: NeutronAllowL3AgentFailover} NovaApiHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} NovaComputeDriver: {get_param: NovaComputeDriver} NovaComputeExtraConfig: {get_param: NovaComputeExtraConfig} @@ -574,12 +608,8 @@ resources: CinderISCSIHelper: {get_param: CinderISCSIHelper} CinderLVMLoopDeviceSize: {get_param: CinderLVMLoopDeviceSize} CinderPassword: {get_param: CinderPassword} - ControllerIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} + VirtualIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} KeyName: {get_param: KeyName} - NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling} - NeutronNetworkType: {get_param: NeutronNetworkType} - NeutronPassword: {get_param: NeutronPassword} - NeutronPublicInterface: {get_param: NeutronPublicInterface} Flavor: {get_param: OvercloudBlockStorageFlavor} RabbitPassword: {get_param: RabbitPassword} RabbitUserName: {get_param: RabbitUserName} |