aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Randon <nicholas.randon@hp.com>2014-05-02 16:52:18 +0100
committerNicholas Randon <nicholas.randon@hp.com>2014-06-03 12:56:58 +0000
commit27c4f4a28b3c057a860c4fa2a0480ba31cef684d (patch)
tree5ba51f0199f146549ccc94fc0a0723a77b7213ef
parent5771b718993ced4bf63e9f713a20bf5a36f2dada (diff)
Add passthrough configuration glue.
This provides a means for users to pass configuration through to the machines they are deploying without us modelling that. Change-Id: Ia8d1564bd0f3e7b988497a84e00831619047cd94
-rw-r--r--undercloud-source.yaml50
1 files changed, 50 insertions, 0 deletions
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 58e4eda8..7206c67c 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -38,6 +38,44 @@ Parameters:
Description: The user password for SNMPd with readonly rights running on all Overcloud nodes
Type: String
NoEcho: true
+ ExtraConfig:
+ Default: {}
+ Description: |
+ Additional configuration to inject into the cluster. The JSON should have
+ the following structure:
+ {"FILEKEY":
+ {"config:
+ [{"section": "SECTIONNAME",
+ "values":
+ [{"option": "OPTIONNAME",
+ "value": "VALUENAME"
+ }
+ ]
+ }
+ ]
+ }
+ }
+ For instance:
+ {"nova":
+ {"config":
+ [{"section": "default",
+ "values":
+ [{"option": "compute_manager",
+ "value": "ironic.nova.compute.manager.ClusterComputeManager"
+ }
+ ]
+ },
+ {"section": "cells",
+ "values":
+ [{"option": "driver",
+ "value": "nova.cells.rpc_driver.CellsRPCDriver"
+ }
+ ]
+ }
+ ]
+ }
+ }
+ Type: Json
Flavor:
Default: baremetal
Description: Flavor to request when deploying.
@@ -205,6 +243,10 @@ Resources:
ntp:
servers:
- {server: {Ref: NtpServer}, fudge: "stratum 0"}
+ undercloudPassthroughConfig:
+ Type: OS::Heat::StructuredConfig
+ Properties:
+ config: {get_input: passthrough_config}
undercloud:
Type: OS::Nova::Server
Properties:
@@ -255,3 +297,11 @@ Resources:
- - 'http://'
- {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { "Fn::GetAtt": [ undercloud, networks ]}]]}
- ':8000/v1/waitcondition'
+ 00_undercloudPassthroughDeployment:
+ Type: OS::Heat::StructuredDeployment
+ Properties:
+ config: {Ref: undercloudPassthroughConfig}
+ server: {Ref: undercloud}
+ signal_transport: NO_SIGNAL
+ input_values:
+ passthrough_config: {Ref: ExtraConfig}