From 4c7726ea436816a6a9a6e786e79fee3c230036b7 Mon Sep 17 00:00:00 2001
From: "Mauro S. M. Rodrigues" <maurosr@linux.vnet.ibm.com>
Date: Thu, 21 Nov 2013 19:11:38 +0000
Subject: [PATCH] Add clean configuration files to upgrade from H to I

Any new configurations for Icehouse should go in one of the upgrade files in
from-havana directory.
Also moves {BASE,TARGET}_RELEASE vars forward to Havana->Icehouse pair.

Change-Id: Iac520a8de4c3b9f14e2289cfb9b6a50c4ab0ce32
---
 from-havana/upgrade-cinder   |  9 +++++++++
 from-havana/upgrade-devstack |  9 +++++++++
 from-havana/upgrade-glance   |  9 +++++++++
 from-havana/upgrade-keystone | 10 ++++++++++
 from-havana/upgrade-nova     | 10 ++++++++++
 from-havana/upgrade-oslo     |  9 +++++++++
 from-havana/upgrade-packages | 18 ++++++++++++++++++
 from-havana/upgrade-swift    |  9 +++++++++
 from-havana/upgrade-tempest  |  9 +++++++++
 functions                    |  5 ++---
 grenaderc                    |  4 ++--
 11 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100755 from-havana/upgrade-cinder
 create mode 100755 from-havana/upgrade-devstack
 create mode 100755 from-havana/upgrade-glance
 create mode 100755 from-havana/upgrade-keystone
 create mode 100755 from-havana/upgrade-nova
 create mode 100755 from-havana/upgrade-oslo
 create mode 100755 from-havana/upgrade-packages
 create mode 100755 from-havana/upgrade-swift
 create mode 100755 from-havana/upgrade-tempest

diff --git a/from-havana/upgrade-cinder b/from-havana/upgrade-cinder
new file mode 100755
index 00000000..81139eda
--- /dev/null
+++ b/from-havana/upgrade-cinder
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# ``upgrade-cinder``
+
+function configure_cinder_upgrade(){
+    set -o xtrace
+    # nothing to see here
+    set +o xtrace
+}
diff --git a/from-havana/upgrade-devstack b/from-havana/upgrade-devstack
new file mode 100755
index 00000000..1dd64d8a
--- /dev/null
+++ b/from-havana/upgrade-devstack
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# ``upgrade-devstack``
+
+function configure_devstack_upgrade(){
+    set -o xtrace
+    # nothing to see here yet
+    set +o xtrace
+}
diff --git a/from-havana/upgrade-glance b/from-havana/upgrade-glance
new file mode 100755
index 00000000..6fae3fe7
--- /dev/null
+++ b/from-havana/upgrade-glance
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# ``upgrade-glance``
+
+function configure_glance_upgrade(){
+    set -o xtrace
+    # nothing to see here
+    set +o xtrace
+}
diff --git a/from-havana/upgrade-keystone b/from-havana/upgrade-keystone
new file mode 100755
index 00000000..a298b848
--- /dev/null
+++ b/from-havana/upgrade-keystone
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# ``upgrade-keystone``
+
+configure_keystone_upgrade(){
+    set -o xtrace
+    # nothing to see here yet
+    set +o xtrace
+}
+
diff --git a/from-havana/upgrade-nova b/from-havana/upgrade-nova
new file mode 100755
index 00000000..cbaa60d1
--- /dev/null
+++ b/from-havana/upgrade-nova
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# ``upgrade-nova``
+
+function configure_nova_upgrade(){
+    set -o xtrace
+    # upgrade rootwrap configs
+    configure_nova_rootwrap
+    set +o xtrace
+}
diff --git a/from-havana/upgrade-oslo b/from-havana/upgrade-oslo
new file mode 100755
index 00000000..d90f358a
--- /dev/null
+++ b/from-havana/upgrade-oslo
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# ``upgrade-oslo``
+
+function configure_oslo_upgrade(){
+    set -o xtrace
+    # nothing to see here yet
+    set +o xtrace
+}
diff --git a/from-havana/upgrade-packages b/from-havana/upgrade-packages
new file mode 100755
index 00000000..808615d0
--- /dev/null
+++ b/from-havana/upgrade-packages
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# ``upgrade_packages``
+
+# Upgrade Dependencies
+# ====================
+
+# Glance
+GLANCE_PIPS=""
+
+# Nova
+NOVA_PIPS=""
+
+# Horizon
+HORIZON_PIPS=""
+
+# Quantum
+QUANTUM_PIPS=""
diff --git a/from-havana/upgrade-swift b/from-havana/upgrade-swift
new file mode 100755
index 00000000..a4e088ed
--- /dev/null
+++ b/from-havana/upgrade-swift
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# ``upgrade-swift``
+
+function configure_swift_upgrade(){
+    set -o xtrace
+    # nothing to see here yet
+    set +o xtrace
+}
diff --git a/from-havana/upgrade-tempest b/from-havana/upgrade-tempest
new file mode 100755
index 00000000..b6df19ec
--- /dev/null
+++ b/from-havana/upgrade-tempest
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# ``upgrade-tempest``
+
+function configure_tempest_upgrade(){
+    set -o xtrace
+    # nothing to see here yet
+    set +o xtrace
+}
diff --git a/functions b/functions
index 288c4741..17ba47bf 100644
--- a/functions
+++ b/functions
@@ -636,11 +636,10 @@ function git_update_tag() {
 
 
 # Returns openstack release name for a given branch name
-# At first it return master for a not released version
 function get_release_name_from_branch(){
     local branch=$1
-    if [ $branch == "stable/grizzly" ]; then
-        echo "grizzly"
+    if [[ $branch =~ "stable/" ]]; then
+        echo ${branch#*/}
     else
         echo "master"
     fi
diff --git a/grenaderc b/grenaderc
index f22aafc5..2a2ab3c0 100644
--- a/grenaderc
+++ b/grenaderc
@@ -13,10 +13,10 @@ STACK_ROOT=/opt/stack
 DATA_DIR=${STACK_ROOT}/data
 
 # Release info
-BASE_RELEASE=grizzly
+BASE_RELEASE=havana
 BASE_RELEASE_DIR=${STACK_ROOT}/$BASE_RELEASE
 
-TARGET_RELEASE=havana
+TARGET_RELEASE=icehouse
 TARGET_RELEASE_DIR=${STACK_ROOT}/$TARGET_RELEASE
 
 # DevStack sources