Skip to content

Commit

Permalink
Update sahara to 303e514db06b34db1ab26e84edbbdf91d98d6679
Browse files Browse the repository at this point in the history
303e514db06b34db1ab26e84edbbdf91d98d6679 Tag all Sahara packages
  • Loading branch information
xbezdick committed Apr 2, 2015
1 parent 34b0529 commit a8ce31f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ mod 'rsync',
:git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'

mod 'sahara',
:commit => '5daa68f89c7eaa8962600aaa1efebff69bdc0489',
:commit => '303e514db06b34db1ab26e84edbbdf91d98d6679',
:git => 'https://github.com/stackforge/puppet-sahara.git'

mod 'ssh',
Expand Down
1 change: 1 addition & 0 deletions sahara/manifests/client.pp
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
package { 'python-saharaclient':
ensure => $package_ensure,
name => $::sahara::params::client_package_name,
tag => 'openstack',
}
}
1 change: 1 addition & 0 deletions sahara/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
package { 'sahara':
ensure => $package_ensure,
name => $::sahara::params::package_name,
tag => 'openstack',
}

Package['sahara'] -> Sahara_config<||>
Expand Down
12 changes: 10 additions & 2 deletions sahara/spec/classes/sahara_client_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,22 @@
shared_examples_for 'sahara client' do

context 'with default parameters' do
it { is_expected.to contain_package('python-saharaclient').with_ensure('present') }
it { is_expected.to contain_package('python-saharaclient').with(
:ensure => 'present',
:tag => 'openstack',
)
}
end

context 'with package_ensure parameter provided' do
let :params do
{ :package_ensure => false }
end
it { is_expected.to contain_package('python-saharaclient').with_ensure('false') }
it { is_expected.to contain_package('python-saharaclient').with(
:ensure => false,
:tag => 'openstack',
)
}
end

end
Expand Down

0 comments on commit a8ce31f

Please sign in to comment.