summaryrefslogtreecommitdiffstats
path: root/nova-compute-instance.yaml
diff options
context:
space:
mode:
authorAlexis Lee <alexisl@hp.com>2014-10-08 15:17:29 +0100
committerAlexis Lee <alexisl@hp.com>2014-10-08 15:40:39 +0100
commit6f3f9ec6da71fec349856e719d0606a6d8b33d91 (patch)
treee8958dbde9f0e707168d16bab4ca953de76daf18 /nova-compute-instance.yaml
parenta35679f539614846f43dbb0b5a3c57dc7e0f34ee (diff)
Sort inputs and parameters
They're mostly rather higgledy-piggledy at the moment which makes it quite difficult to compare against files where these are sorted. EG compute.yaml from I687a00c7dc164ba044f9f2dfca96a02401427855. Change-Id: I508a3d0f6a79810d2100fdd1ad143bcd37bf8c00
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r--nova-compute-instance.yaml194
1 files changed, 96 insertions, 98 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 5b54a540..2fdf97b8 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -6,6 +6,33 @@ parameters:
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
type: string
hidden: true
+ AllNodesConfig:
+ type: string
+ description: OS::Heat::Config to use for all nodes deployment
+ CeilometerComputeAgent:
+ description: Indicates whether the Compute agent is present and expects nova-compute to be configured accordingly
+ type: string
+ default: ''
+ constraints:
+ - allowed_values: ['', Present]
+ CeilometerDSN:
+ type: string
+ CeilometerMeteringSecret:
+ default: unset
+ description: Secret shared by the ceilometer services.
+ type: string
+ hidden: true
+ CeilometerPassword:
+ default: unset
+ description: The password for the ceilometer service account.
+ type: string
+ hidden: true
+ DefaultSignalTransport:
+ default: CFN_SIGNAL
+ description: Transport to use for software-config signals.
+ type: string
+ constraints:
+ - allowed_values: [ CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL ]
ExtraConfig:
default: {}
description: |
@@ -44,31 +71,52 @@ parameters:
}
}
type: json
- NovaComputeExtraConfig:
- default: {}
- description: |
- NovaCompute specific configuration to inject into the cluster. Same
- structure as ExtraConfig.
- type: json
- KeyName:
- description: Name of an existing EC2 KeyPair to enable SSH access to the instances
+ GlanceHost:
type: string
- default: default
- OvercloudComputeFlavor:
- description: Use this flavor
+ GlancePort:
+ default: 9292
+ description: Glance port.
+ type: string
+ GlanceProtocol:
+ default: http
+ description: Protocol to use when connecting to glance, set to https for SSL.
type: string
- default: baremetal
ImageUpdatePolicy:
default: 'REBUILD_PRESERVE_EPHEMERAL'
description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
type: string
- NovaImage:
+ KeyName:
+ description: Name of an existing EC2 KeyPair to enable SSH access to the instances
type: string
- default: overcloud-compute
- NtpServer:
+ default: default
+ KeystoneHost:
+ type: string
+ LiveUpdateComputeImage:
type: string
+ description: The image ID for live-updates to the overcloud compute nodes.
default: ''
- KeystoneHost:
+ 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:
+ type: string
+ NeutronEnableTunnelling:
type: string
NeutronFlatNetworks:
type: string
@@ -76,6 +124,12 @@ parameters:
description: If set, flat networks to configure in neutron plugins.
NeutronHost:
type: string
+ NeutronNetworkType:
+ default: 'gre'
+ description: The tenant network type for Neutron, either gre or vxlan.
+ type: string
+ NeutronNetworkVLANRanges:
+ type: string
NeutronPhysicalBridge:
default: ''
description: An OVS bridge to create for accessing external networks.
@@ -84,117 +138,61 @@ parameters:
default: ''
description: A port to add to the NeutronPhysicalBridge.
type: string
- NeutronNetworkType:
- default: 'gre'
- description: The tenant network type for Neutron, either gre or vxlan.
- 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
- RabbitHost:
- type: string
- RabbitUserName:
- type: string
- RabbitPassword:
- type: string
- hidden: true
- CeilometerComputeAgent:
- description: Indicates whether the Compute agent is present and expects nova-compute to be configured accordingly
- type: string
- default: ''
- constraints:
- - allowed_values: ['', Present]
- CeilometerMeteringSecret:
- default: unset
- description: Secret shared by the ceilometer services.
- type: string
- hidden: true
- CeilometerPassword:
- default: unset
- description: The password for the ceilometer service account.
- type: string
- hidden: 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
+ NovaApiHost:
type: string
- hidden: true
NovaComputeDriver:
type: string
default: libvirt.LibvirtDriver
+ NovaComputeExtraConfig:
+ default: {}
+ description: |
+ NovaCompute specific configuration to inject into the cluster. Same
+ structure as ExtraConfig.
+ type: json
NovaComputeLibvirtType:
type: string
default: ''
- NovaApiHost:
+ NovaDSN:
+ type: string
+ NovaImage:
type: string
+ default: overcloud-compute
NovaPassword:
default: unset
description: The password for the nova service account, used by nova-api.
type: string
hidden: true
- GlanceHost:
- type: string
- GlancePort:
- default: 9292
- description: Glance port.
- type: string
- GlanceProtocol:
- default: http
- description: Protocol to use when connecting to glance, set to https for SSL.
- type: string
- CeilometerDSN:
- type: string
- NovaDSN:
- type: string
NovaPublicIP:
type: string
- NeutronDSN:
- type: string
- NeutronBridgeMappings:
- type: string
- NeutronNetworkVLANRanges:
- type: string
- NeutronNetworkType:
- type: string
- NeutronEnableTunnelling:
- type: string
- AllNodesConfig:
- type: string
- description: OS::Heat::Config to use for all nodes deployment
- LiveUpdateUserName:
+ NtpServer:
type: string
- description: The live-update username for the undercloud Glance API.
default: ''
- LiveUpdateTenantName:
+ OvercloudComputeFlavor:
+ description: Use this flavor
type: string
- description: The live-update tenant name for the undercloud Glance API.
- default: ''
- LiveUpdateHost:
+ default: baremetal
+ RabbitHost:
type: string
- description: The IP address for the undercloud Glance API.
- default: ''
- LiveUpdatePassword:
+ RabbitUserName:
+ type: string
+ RabbitPassword:
type: string
- default: ''
- description: The live-update password for the undercloud Glance API.
hidden: true
- LiveUpdateComputeImage:
+ SnmpdReadonlyUserName:
+ default: ro_snmp_user
+ description: The user name for SNMPd with readonly rights running on all Overcloud nodes
type: string
- description: The image ID for live-updates to the overcloud compute nodes.
- default: ''
- DefaultSignalTransport:
- default: CFN_SIGNAL
- description: Transport to use for software-config signals.
+ SnmpdReadonlyUserPassword:
+ default: unset
+ description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
- constraints:
- - allowed_values: [ CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL ]
+ hidden: true
resources:
NovaCompute0:
type: OS::Nova::Server