Merge "Remove Compute role parameters from overcloud.yaml"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
bb69c71855
|
|
@ -12,18 +12,6 @@ description: >
|
|||
parameters:
|
||||
|
||||
# Common parameters (not specific to a role)
|
||||
AdminPassword:
|
||||
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
|
||||
type: string
|
||||
hidden: true
|
||||
CinderEnableNfsBackend:
|
||||
default: false
|
||||
description: Whether to enable or not the NFS backend for Cinder
|
||||
type: boolean
|
||||
CinderEnableRbdBackend:
|
||||
default: false
|
||||
description: Whether to enable or not the Rbd backend for Cinder
|
||||
type: boolean
|
||||
CloudName:
|
||||
default: overcloud
|
||||
description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
|
||||
|
|
@ -32,10 +20,6 @@ parameters:
|
|||
default: []
|
||||
description: Should be used for arbitrary ips.
|
||||
type: json
|
||||
Debug:
|
||||
default: ''
|
||||
description: Set to True to enable debugging on all services.
|
||||
type: string
|
||||
InternalApiVirtualFixedIPs:
|
||||
default: []
|
||||
description: >
|
||||
|
|
@ -46,22 +30,10 @@ parameters:
|
|||
default: 'ctlplane'
|
||||
type: string
|
||||
description: Neutron ID or name for ctlplane network.
|
||||
NeutronPassword:
|
||||
description: The password for the neutron service account, used by neutron agents.
|
||||
type: string
|
||||
hidden: true
|
||||
NeutronPublicInterface:
|
||||
default: nic1
|
||||
description: What interface to bridge onto br-ex for network nodes.
|
||||
type: string
|
||||
NovaIPv6:
|
||||
default: false
|
||||
description: Enable IPv6 features in Nova
|
||||
type: boolean
|
||||
NovaPassword:
|
||||
description: The password for the nova service account, used by nova-api.
|
||||
type: string
|
||||
hidden: true
|
||||
PublicVirtualFixedIPs:
|
||||
default: []
|
||||
description: >
|
||||
|
|
@ -72,24 +44,6 @@ parameters:
|
|||
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
|
||||
type: string
|
||||
RabbitPassword:
|
||||
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
|
||||
StorageVirtualFixedIPs:
|
||||
default: []
|
||||
description: >
|
||||
|
|
@ -152,34 +106,6 @@ parameters:
|
|||
default: nic1
|
||||
description: What interface to add to the HypervisorNeutronPhysicalBridge.
|
||||
type: string
|
||||
NovaComputeDriver:
|
||||
type: string
|
||||
default: libvirt.LibvirtDriver
|
||||
NovaComputeExtraConfig:
|
||||
default: {}
|
||||
description: |
|
||||
NovaCompute specific configuration to inject into the cluster. Same
|
||||
structure as ExtraConfig.
|
||||
type: json
|
||||
NovaComputeLibvirtType:
|
||||
default: kvm
|
||||
type: string
|
||||
NovaComputeLibvirtVifDriver:
|
||||
default: ''
|
||||
description: Libvirt VIF driver configuration for the network
|
||||
type: string
|
||||
NovaEnableRbdBackend:
|
||||
default: false
|
||||
description: Whether to enable or not the Rbd backend for Nova
|
||||
type: boolean
|
||||
NovaOVSBridge:
|
||||
default: 'br-int'
|
||||
description: Name of integration bridge used by Open vSwitch
|
||||
type: string
|
||||
NovaSecurityGroupAPI:
|
||||
default: 'neutron'
|
||||
description: The full class name of the security API class
|
||||
type: string
|
||||
ServiceNetMap:
|
||||
default:
|
||||
NeutronTenantNetwork: tenant
|
||||
|
|
@ -541,44 +467,22 @@ resources:
|
|||
resource_def:
|
||||
type: OS::TripleO::Compute
|
||||
properties:
|
||||
AdminPassword: {get_param: AdminPassword}
|
||||
CinderEnableNfsBackend: {get_param: CinderEnableNfsBackend}
|
||||
CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend}
|
||||
Debug: {get_param: Debug}
|
||||
ExtraConfig: {get_param: ExtraConfig}
|
||||
GlanceHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
|
||||
KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
|
||||
KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
|
||||
NeutronPassword: {get_param: NeutronPassword}
|
||||
NeutronPhysicalBridge: {get_param: HypervisorNeutronPhysicalBridge}
|
||||
NeutronPublicInterface: {get_param: HypervisorNeutronPublicInterface}
|
||||
# L3 HA and Failover is not relevant for Computes, should be removed
|
||||
NovaApiHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
|
||||
NovaComputeDriver: {get_param: NovaComputeDriver}
|
||||
NovaComputeExtraConfig: {get_param: NovaComputeExtraConfig}
|
||||
NovaComputeLibvirtType: {get_param: NovaComputeLibvirtType}
|
||||
NovaComputeLibvirtVifDriver: {get_param: NovaComputeLibvirtVifDriver}
|
||||
NovaEnableRbdBackend: {get_param: NovaEnableRbdBackend}
|
||||
NovaIPv6: {get_param: NovaIPv6}
|
||||
NovaPublicIP: {get_attr: [VipMap, net_ip_map, external]}
|
||||
NovaPassword: {get_param: NovaPassword}
|
||||
NovaOVSBridge: {get_param: NovaOVSBridge}
|
||||
NovaSecurityGroupAPI: {get_param: NovaSecurityGroupAPI}
|
||||
RabbitHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
|
||||
RabbitPassword: {get_param: RabbitPassword}
|
||||
RabbitUserName: {get_param: RabbitUserName}
|
||||
RabbitClientUseSSL: {get_param: RabbitClientUseSSL}
|
||||
RabbitClientPort: {get_param: RabbitClientPort}
|
||||
ServiceNetMap: {get_param: ServiceNetMap}
|
||||
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
|
||||
UpdateIdentifier: {get_param: UpdateIdentifier}
|
||||
Hostname:
|
||||
str_replace:
|
||||
template: {get_param: ComputeHostnameFormat}
|
||||
params:
|
||||
'%stackname%': {get_param: 'OS::stack_name'}
|
||||
CloudDomain: {get_param: CloudDomain}
|
||||
ServerMetadata: {get_param: ServerMetadata}
|
||||
NodeIndex: '%index%'
|
||||
ServiceConfigSettings: {get_attr: [ComputeServiceChain, role_data, config_settings]}
|
||||
ServiceNames: {get_attr: [ComputeServiceChain, role_data, service_names]}
|
||||
|
|
|
|||
Loading…
Reference in New Issue