summaryrefslogtreecommitdiffstats
path: root/nova-compute-instance.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r--nova-compute-instance.yaml18
1 files changed, 14 insertions, 4 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index c5f4337c..f8b5ebee 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -136,6 +136,8 @@ parameters:
type: string
NovaDSN:
type: string
+ NovaPublicIP:
+ type: string
NeutronDSN:
type: string
NeutronBridgeMappings:
@@ -170,6 +172,12 @@ parameters:
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.
+ type: string
+ constraints:
+ - allowed_values: [ CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL ]
resources:
NovaCompute0:
type: OS::Nova::Server
@@ -183,8 +191,8 @@ resources:
networks:
- network: ctlplane
user_data_format: SOFTWARE_CONFIG
- NovaCompute0Deploy:
- depends_on: [controller0AllNodes]
+ NovaCompute0Deployment:
+ depends_on: [controller0AllNodesDeployment]
type: OS::Heat::StructuredDeployment
properties:
signal_transport: NO_SIGNAL
@@ -194,6 +202,7 @@ resources:
nova_compute_driver: {get_param: NovaComputeDriver}
nova_compute_libvirt_type: {get_param: NovaComputeLibvirtType}
nova_dsn: {get_param: NovaDSN}
+ nova_public_ip: {get_param: NovaPublicIP}
nova_api_host: {get_param: NovaApiHost}
nova_password: {get_param: NovaPassword}
ceilometer_dsn: {get_param: CeilometerDSN}
@@ -228,14 +237,15 @@ resources:
nova_image: {get_param: NovaImage}
live_update_image_id: {get_param: LiveUpdateComputeImage}
ntp_server: {get_param: NtpServer}
- NovaCompute0AllNodesDeploy:
+ NovaCompute0AllNodesDeployment:
depends_on: [NovaCompute0Passthrough]
type: OS::Heat::StructuredDeployment
properties:
+ signal_transport: {get_param: DefaultSignalTransport}
config: {get_param: AllNodesConfig}
server: {get_resource: NovaCompute0}
NovaCompute0Passthrough:
- depends_on: [NovaCompute0Deploy]
+ depends_on: [NovaCompute0Deployment]
type: OS::Heat::StructuredDeployment
properties:
config: {get_resource: NovaComputePassthrough}