diff --git a/deployment/puppet/osnailyfacter/modular/roles/ironic-compute.pp b/deployment/puppet/osnailyfacter/modular/roles/ironic-compute.pp index 847a74221a..1e4f804877 100644 --- a/deployment/puppet/osnailyfacter/modular/roles/ironic-compute.pp +++ b/deployment/puppet/osnailyfacter/modular/roles/ironic-compute.pp @@ -92,7 +92,7 @@ class { 'nova::network::neutron': } file { '/etc/nova/nova-compute.conf': - ensure => absent, + content => "[DEFAULT]\nhost=ironic-compute", require => Package['nova-compute'], } ~> Service['nova-compute'] diff --git a/tests/noop/spec/hosts/roles/ironic-compute_spec.rb b/tests/noop/spec/hosts/roles/ironic-compute_spec.rb index 1c8c9b9e26..45651a73ab 100644 --- a/tests/noop/spec/hosts/roles/ironic-compute_spec.rb +++ b/tests/noop/spec/hosts/roles/ironic-compute_spec.rb @@ -43,6 +43,10 @@ describe manifest do 'value' => memcache_servers, ) end + + it 'nova-compute.conf should have host set to "ironic-compute"' do + should contain_file('/etc/nova/nova-compute.conf').with('content' => "[DEFAULT]\nhost=ironic-compute") + end end end