openstack/fuel-library
Code Issues Proposed changes

Revert "Add Sheepdog package to dependency chain of Glance."

Browse Source 
This reverts commit 2abfac4183.

Change-Id: I23d1753be11334c940966cf479c892971f76aabf
Closes-bug: #1283187
This commit is contained in:
Dmitry Borodaenko 2014-02-21 12:22:26 -08:00
parent 95e599761c
commit 7cdf5c5f1d
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/puppet/glance/manifests/backend/swift.pp
View File

@ -32,15 +32,5 @@ class glance::backend::swift(
'DEFAULT/swift_store_create_container_on_put':
value => $swift_store_create_container_on_put;
}
# Sheepdog's binary 'collie' hardcoded somewhere inside glance.
package { 'sheepdog':
name => $::glance::params::sheepdog_package_name,
ensure => $package_ensure,
}
tweaks::ubuntu_service_override {$::glance::params::sheepdog_package_name :}
service { $::glance::params::sheepdog_package_name:
ensure => stopped,
enable => false,
}
Package['sheepdog'] -> Package['glance']
}

1
deployment/puppet/glance/manifests/init.pp
View File

@ -28,5 +28,4 @@ class glance(
name => $::glance::params::package_name,
ensure => $package_ensure,
}
}

3
deployment/puppet/glance/manifests/params.pp
View File

@ -14,7 +14,7 @@ class glance::params {
$db_sync_command = 'glance-manage db_sync'
}
'Debian': {
$package_name = 'glance-common'
$package_name = 'glance-common'
$api_package_name = 'glance-api'
$registry_package_name = 'glance-registry'
$api_service_name = 'glance-api'
@ -25,6 +25,5 @@ class glance::params {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
}
}
$sheepdog_package_name = 'sheepdog'
}