From e1450e686513ec4852952978e0af0a0fc5586d71 Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@hastexo.com>
Date: Wed, 16 Oct 2013 08:39:39 +0200
Subject: [PATCH] Wrap openstack::repo, and add a "kickstack_release" variable

Make sure we can set the desired OpenStack release.
---
 manifests/init.pp   | 3 ++-
 manifests/params.pp | 8 ++++++++
 manifests/repo.pp   | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 manifests/repo.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index c9272f8..2533357 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,6 +19,7 @@ class kickstack (
   $fact_prefix   = $kickstack::params::fact_prefix,
   $fact_filename = $kickstack::params::fact_filename,
   $fact_category = $kickstack::params::fact_category,
+  $release = $kickstack::params::release,
   $package_ensure = $kickstack::params::package_ensure,
   $name_resolution = $kickstack::params::name_resolution,
   $verbose       = $kickstack::params::verbose,
@@ -62,7 +63,7 @@ class kickstack (
 ) inherits kickstack::params {
 
   include ::exportfact
-  include openstack::repo
+  include kickstack::repo
   include kickstack::nameresolution
 
   ::exportfact::import { $fact_category: }
diff --git a/manifests/params.pp b/manifests/params.pp
index e83c094..3595599 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -21,6 +21,14 @@ class kickstack::params {
   $package_ensure = pick(getvar("::${variable_prefix}package_ensure"),
                          '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
   # each other.
   # * default "hosts" -- manage /etc/hosts
diff --git a/manifests/repo.pp b/manifests/repo.pp
new file mode 100644
index 0000000..b702304
--- /dev/null
+++ b/manifests/repo.pp
@@ -0,0 +1,5 @@
+class kickstack::repo inherits kickstack {
+  class { '::openstack::repo':
+    release => $::kickstack::release
+  }
+}