diff --git a/.gitignore b/.gitignore index 042df2d68..d4a93a066 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ *.swp spec/fixtures/modules/* -spec/fixtures/manifests/site.pp pkg Gemfile.lock diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp new file mode 100644 index 000000000..bae85c0cb --- /dev/null +++ b/spec/fixtures/manifests/site.pp @@ -0,0 +1,7 @@ +node default {} + +node 'test-001.example.org' { + include ::nova + include ::nova::consoleauth + include ::nova::spicehtml5proxy +} diff --git a/spec/hosts/test-001_spec.rb b/spec/hosts/test-001_spec.rb new file mode 100644 index 000000000..08c823f8f --- /dev/null +++ b/spec/hosts/test-001_spec.rb @@ -0,0 +1,19 @@ +require 'spec_helper' + +describe 'test-001.example.org' do + + context 'on RedHat platforms' do + let :facts do + { :osfamily => 'RedHat' } + end + + # Bug #1278452 + it 'nova::consoleauth and nova::spicehtml5proxy do not conflict' do + should contain_class('nova::consoleauth') + should contain_class('nova::spicehtml5proxy') + + should contain_nova__generic_service('consoleauth') + should contain_nova__generic_service('spicehtml5proxy') + end + end +end