Fix Ironic templates
The merge of ironic-source wasn't actually merging, leading to bad templates. As part of this add the needed SSH virtual power key (because like nova-bm, Ironic requires that for now). We also need to set the compute_manager for nova with Ironic, so that gets set too. Change-Id: I0d7d535dbac3584b3eb12865259ee6403e20c98f
This commit is contained in:
parent
7ded3131bd
commit
2817287d36
2
Makefile
2
Makefile
@ -33,7 +33,7 @@ undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tusk
|
||||
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
|
||||
mv $@.tmp $@
|
||||
|
||||
undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml ironic-source.yaml
|
||||
undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml
|
||||
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
|
||||
mv $@.tmp $@
|
||||
|
||||
|
@ -1,14 +0,0 @@
|
||||
Description: 'Ironic: Bare Metal provisioning, API and Conductor services.'
|
||||
Parameters:
|
||||
IronicPassword:
|
||||
Type: String
|
||||
Description: Ironic password for keystone access
|
||||
NoEcho: true
|
||||
Resources:
|
||||
ironic:
|
||||
Type: AWS::AutoScaling::LaunchConfiguration
|
||||
Metadata:
|
||||
OpenStack::Role: undercloudConfig
|
||||
ironic:
|
||||
db: mysql://ironic:unset@localhost/ironic
|
||||
service-password: {Ref: IronicPassword}
|
@ -1,15 +1,30 @@
|
||||
Parameters:
|
||||
IronicPassword:
|
||||
Type: String
|
||||
Description: Ironic password for keystone access
|
||||
NoEcho: true
|
||||
NeutronPublicInterface:
|
||||
Default: eth0
|
||||
Description: What interface to bridge onto br-ex for network nodes.
|
||||
Type: String
|
||||
PowerSSHPrivateKey:
|
||||
Description: Private key for using to ssh to a virtual power host.
|
||||
Type: String
|
||||
NoEcho: true
|
||||
Resources:
|
||||
undercloudConfig:
|
||||
Type: AWS::AutoScaling::LaunchConfiguration
|
||||
Metadata:
|
||||
ironic:
|
||||
db: mysql://ironic:unset@localhost/ironic
|
||||
service-password:
|
||||
Ref: IronicPassword
|
||||
virtual_power_ssh_key:
|
||||
Ref: PowerSSHPrivateKey
|
||||
nova:
|
||||
compute_hostname: undercloud
|
||||
compute_driver: ironic.nova.virt.ironic.driver.IronicDriver
|
||||
compute_manager: ironic.nova.compute.manager.ClusteredComputeManager
|
||||
db: mysql://nova:unset@localhost/nova
|
||||
default_ephemeral_format: ext4
|
||||
host: 127.0.0.1
|
||||
|
Loading…
x
Reference in New Issue
Block a user