From 656b8385efde3e686c1f969bd5b32af0b08181af Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 5 Sep 2014 14:39:35 -0500 Subject: [PATCH] Undercloud params for compute driver and manager Add undercloud template parameters for NovaComputeDriver, NovaComputeManager, and NovaSchedulerHostManager. The motivation here is to be able to test configure Nova to use the new (in-tree) Ironic compute driver (which used to live in Ironic). NOTE: The initial Nova in-tree Ironic driver won't have its own ClusteredComputeManager (compute_manager). Even so I've gone ahead and added a parameter for NovaComputeManager so we can modify this accordingly in the future without making hard coded template changes. Change-Id: Ib48a6b6d8a6cff157bdf3948bd0330e9b29dd46a --- undercloud-bm-nova-config.yaml | 4 +++- undercloud-bm-nova-deploy.yaml | 12 ++++++++++++ undercloud-vm-ironic-config.yaml | 5 +++-- undercloud-vm-ironic-deploy.yaml | 12 ++++++++++++ undercloud-vm-nova-config.yaml | 4 +++- undercloud-vm-nova-deploy.yaml | 12 ++++++++++++ 6 files changed, 45 insertions(+), 4 deletions(-) diff --git a/undercloud-bm-nova-config.yaml b/undercloud-bm-nova-config.yaml index ba39710b..e70c9099 100644 --- a/undercloud-bm-nova-config.yaml +++ b/undercloud-bm-nova-config.yaml @@ -5,7 +5,9 @@ resources: config: nova: compute_hostname: undercloud - compute_driver: baremetal.driver.BareMetalDriver + compute_driver: {get_param: NovaComputeDriver} + compute_manager: {get_param: NovaComputeManager} + scheduler_host_manager: {get_param: NovaSchedulerHostManager} db: mysql://nova:unset@localhost/nova default_ephemeral_format: ext4 host: 127.0.0.1 diff --git a/undercloud-bm-nova-deploy.yaml b/undercloud-bm-nova-deploy.yaml index d328449c..d46fc076 100644 --- a/undercloud-bm-nova-deploy.yaml +++ b/undercloud-bm-nova-deploy.yaml @@ -3,6 +3,18 @@ parameters: default: eth2 description: What interface to bridge onto br-ex for network nodes. type: string + NovaComputeDriver: + default: baremetal.driver.BareMetalDriver + description: Full class name for the Nova compute driver + type: string + NovaComputeManager: + default: nova.compute.manager.ComputeManager + description: Full class name for the Nova compute manager + type: string + NovaSchedulerHostManager: + default: nova.scheduler.host_manager.HostManager + description: Full class name for the Nova scheduler host manager + type: string PowerManager: default: nova.virt.baremetal.ipmi.IPMI description: Bare metal power manager driver. diff --git a/undercloud-vm-ironic-config.yaml b/undercloud-vm-ironic-config.yaml index af049d87..f5aa4981 100644 --- a/undercloud-vm-ironic-config.yaml +++ b/undercloud-vm-ironic-config.yaml @@ -5,8 +5,9 @@ resources: config: nova: compute_hostname: undercloud - compute_driver: ironic.nova.virt.ironic.driver.IronicDriver - compute_manager: ironic.nova.compute.manager.ClusteredComputeManager + compute_driver: {get_param: NovaComputeDriver} + compute_manager: {get_param: NovaComputeManager} + scheduler_host_manager: {get_param: NovaSchedulerHostManager} db: mysql://nova:unset@localhost/nova debug: {get_param: Debug} default_ephemeral_format: ext4 diff --git a/undercloud-vm-ironic-deploy.yaml b/undercloud-vm-ironic-deploy.yaml index 6e778e59..f1d3af78 100644 --- a/undercloud-vm-ironic-deploy.yaml +++ b/undercloud-vm-ironic-deploy.yaml @@ -7,6 +7,18 @@ parameters: default: eth0 description: What interface to bridge onto br-ex for network nodes. type: string + NovaComputeDriver: + default: ironic.nova.virt.ironic.driver.IronicDriver + description: Full class name for the Nova compute driver + type: string + NovaComputeManager: + default: ironic.nova.compute.manager.ClusteredComputeManager + description: Full class name for the Nova compute manager + type: string + NovaSchedulerHostManager: + default: ironic.nova.scheduler.ironic_host_manager.IronicHostManager + description: Full class name for the Nova scheduler host manager + type: string PowerSSHPrivateKey: description: Private key for using to ssh to a virtual power host. type: string diff --git a/undercloud-vm-nova-config.yaml b/undercloud-vm-nova-config.yaml index 77d23c1e..9dbb8c22 100644 --- a/undercloud-vm-nova-config.yaml +++ b/undercloud-vm-nova-config.yaml @@ -5,7 +5,9 @@ resources: config: nova: compute_hostname: undercloud - compute_driver: baremetal.driver.BareMetalDriver + compute_driver: {get_param: NovaComputeDriver} + compute_manager: {get_param: NovaComputeManager} + scheduler_host_manager: {get_param: NovaSchedulerHostManager} db: mysql://nova:unset@localhost/nova default_ephemeral_format: ext4 host: 127.0.0.1 diff --git a/undercloud-vm-nova-deploy.yaml b/undercloud-vm-nova-deploy.yaml index ebd14ef6..7b13643c 100644 --- a/undercloud-vm-nova-deploy.yaml +++ b/undercloud-vm-nova-deploy.yaml @@ -3,6 +3,18 @@ parameters: default: eth0 description: What interface to bridge onto br-ex for network nodes. type: string + NovaComputeDriver: + default: baremetal.driver.BareMetalDriver + description: Full class name for the Nova compute driver + type: string + NovaComputeManager: + default: nova.compute.manager.ComputeManager + description: Full class name for the Nova compute manager + type: string + NovaSchedulerHostManager: + default: nova.scheduler.host_manager.HostManager + description: Full class name for the Nova scheduler host manager + type: string PowerManager: default: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager description: Bare metal power manager driver. -- 2.16.6