From 7526bfa4faf8b0b3762c22a71b52e2cd13db1193 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Thu, 7 Jul 2016 12:00:58 +0200 Subject: [PATCH] Include openstacklib defaults manifest. This provides a mechanism for setting default across all modules. Change-Id: I15dfca3d411b6da653718627549f186da704e6ae Related-Bug: 1599113 --- manifests/params.pp | 1 + spec/classes/ironic_wsgi_apache_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 0e8f7b50..e8e0acd8 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -19,6 +19,7 @@ # class ironic::params { + include ::openstacklib::defaults $dbsync_command = 'ironic-dbsync --config-file /etc/ironic/ironic.conf' diff --git a/spec/classes/ironic_wsgi_apache_spec.rb b/spec/classes/ironic_wsgi_apache_spec.rb index 8968661d..80394acf 100644 --- a/spec/classes/ironic_wsgi_apache_spec.rb +++ b/spec/classes/ironic_wsgi_apache_spec.rb @@ -3,11 +3,11 @@ require 'spec_helper' describe 'ironic::wsgi::apache' do let :global_facts do - { + OSDefaults.get_facts({ :processorcount => 42, :concat_basedir => '/var/lib/puppet/concat', :fqdn => 'some.host.tld' - } + }) end shared_examples_for 'apache serving ironic with mod_wsgi' do