From b5e64b73373a647997bfb304cfcb31ff07cc8253 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Mon, 19 Jun 2017 12:15:25 +0100 Subject: [PATCH] Install ironicclient if using the Ironic Driver Also add a dependency on puppet-ironic. Change-Id: I9afd336a1c555da9453281c9c8f5eedb83ffb324 --- manifests/compute/ironic.pp | 1 + metadata.json | 4 ++++ spec/classes/nova_compute_ironic_spec.rb | 1 + 3 files changed, 6 insertions(+) diff --git a/manifests/compute/ironic.pp b/manifests/compute/ironic.pp index a8c79faf7..747436e63 100644 --- a/manifests/compute/ironic.pp +++ b/manifests/compute/ironic.pp @@ -19,6 +19,7 @@ class nova::compute::ironic ( include ::nova::deps require ::nova::ironic::common + include ::ironic::client nova_config { 'DEFAULT/compute_driver': value => $compute_driver; diff --git a/metadata.json b/metadata.json index 1a0853f73..cf456f92b 100644 --- a/metadata.json +++ b/metadata.json @@ -25,6 +25,10 @@ "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" }, + { + "name": "openstack/ironic", + "version_requirement": ">=11.1.0 <12.0.0" + }, { "name": "openstack/keystone", "version_requirement": ">=11.2.0 <12.0.0" diff --git a/spec/classes/nova_compute_ironic_spec.rb b/spec/classes/nova_compute_ironic_spec.rb index df028f7ea..6b444e4bd 100644 --- a/spec/classes/nova_compute_ironic_spec.rb +++ b/spec/classes/nova_compute_ironic_spec.rb @@ -8,6 +8,7 @@ describe 'nova::compute::ironic' do it 'configures ironic in nova.conf' do is_expected.to contain_nova_config('DEFAULT/compute_driver').with_value('ironic.IronicDriver') is_expected.to contain_nova_config('DEFAULT/max_concurrent_builds').with_value('') + is_expected.to contain_class('ironic::client') end end