Wrap openstack::repo, and add a "kickstack_release" variable

Make sure we can set the desired OpenStack release.
This commit is contained in:
Florian Haas 2013-10-16 08:39:39 +02:00
parent 477a662384
commit e1450e6865
3 changed files with 15 additions and 1 deletions

View File

@ -19,6 +19,7 @@ class kickstack (
$fact_prefix = $kickstack::params::fact_prefix, $fact_prefix = $kickstack::params::fact_prefix,
$fact_filename = $kickstack::params::fact_filename, $fact_filename = $kickstack::params::fact_filename,
$fact_category = $kickstack::params::fact_category, $fact_category = $kickstack::params::fact_category,
$release = $kickstack::params::release,
$package_ensure = $kickstack::params::package_ensure, $package_ensure = $kickstack::params::package_ensure,
$name_resolution = $kickstack::params::name_resolution, $name_resolution = $kickstack::params::name_resolution,
$verbose = $kickstack::params::verbose, $verbose = $kickstack::params::verbose,
@ -62,7 +63,7 @@ class kickstack (
) inherits kickstack::params { ) inherits kickstack::params {
include ::exportfact include ::exportfact
include openstack::repo include kickstack::repo
include kickstack::nameresolution include kickstack::nameresolution
::exportfact::import { $fact_category: } ::exportfact::import { $fact_category: }

View File

@ -21,6 +21,14 @@ class kickstack::params {
$package_ensure = pick(getvar("::${variable_prefix}package_ensure"), $package_ensure = pick(getvar("::${variable_prefix}package_ensure"),
'installed') 'installed')
# The OpenStack release to install
# * default 'grizzly'
# * override by setting to 'folsom' (not recommended) or 'havana'
# This is for new installations only; don't expect this to magically
# support rolling releases.
$release = pick(getvar("::${variable_prefix}release"),
'grizzly')
# The strategy to use so machines can make their hostnames known to # The strategy to use so machines can make their hostnames known to
# each other. # each other.
# * default "hosts" -- manage /etc/hosts # * default "hosts" -- manage /etc/hosts

5
manifests/repo.pp Normal file
View File

@ -0,0 +1,5 @@
class kickstack::repo inherits kickstack {
class { '::openstack::repo':
release => $::kickstack::release
}
}