Merge "Add clean configuration files to upgrade from H to I"

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
+}

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
+}

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
+}

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
+}
+

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
+}

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
+}

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=""

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
+}

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
+}

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

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