From 6e8904062f70e85fe7ade9081d41a1e25d1020e9 Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@citynetwork.eu>
Date: Fri, 31 Aug 2018 10:03:02 +0200
Subject: [PATCH] Update docs & upgrade scripts for Stein

Closes-Bug: #1790158
Change-Id: I37d8c90dedf0cf9e36c913ba7541440b9964e631
---
 deploy-guide/source/conf.py                                   | 4 ++--
 doc/source/admin/troubleshooting.rst                          | 4 ++--
 doc/source/conf.py                                            | 4 ++--
 doc/source/contributor/periodic-work.rst                      | 4 ++--
 scripts/gate-check-commit.sh                                  | 2 +-
 scripts/run-upgrade.sh                                        | 4 ++--
 scripts/upgrade-utilities/playbooks/deploy-config-changes.yml | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py
index b97a11c341..513b39a17d 100644
--- a/deploy-guide/source/conf.py
+++ b/deploy-guide/source/conf.py
@@ -32,8 +32,8 @@ import openstackdocstheme
 # Variables to override
 target_name = 'openstack-ansible'
 description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.'
-previous_series_name = 'queens'
-current_series_name = 'rocky'
+previous_series_name = 'rocky'
+current_series_name = 'stein'
 
 # General information about the project.
 author = 'OpenStack-Ansible Contributors'
diff --git a/doc/source/admin/troubleshooting.rst b/doc/source/admin/troubleshooting.rst
index 47070cf2b6..95a4ee06fc 100644
--- a/doc/source/admin/troubleshooting.rst
+++ b/doc/source/admin/troubleshooting.rst
@@ -482,9 +482,9 @@ identity problems:
    registry is working.
 
 For an example and more information, see `Verify operation
-<https://docs.openstack.org/glance/queens/install/verify.html>_`.
+<https://docs.openstack.org/glance/latest/install/verify.html>_`.
 and `Manage Images
-<https://docs.openstack.org/glance/queens/admin/manage-images.html>_`
+<https://docs.openstack.org/glance/latest/admin/manage-images.html>_`
 
 RabbitMQ issues
 ~~~~~~~~~~~~~~~
diff --git a/doc/source/conf.py b/doc/source/conf.py
index bec4cab5e5..828ed4b918 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -34,8 +34,8 @@ import openstackdocstheme
 # Variables to override
 target_name = 'openstack-ansible'
 description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.'
-previous_series_name = 'queens'
-current_series_name = 'rocky'
+previous_series_name = 'rocky'
+current_series_name = 'stein'
 
 ## General information about the project.
 author = 'OpenStack-Ansible Contributors'
diff --git a/doc/source/contributor/periodic-work.rst b/doc/source/contributor/periodic-work.rst
index bbcb4bafe2..096ee0e91d 100644
--- a/doc/source/contributor/periodic-work.rst
+++ b/doc/source/contributor/periodic-work.rst
@@ -112,7 +112,7 @@ development team by performing one of the following recurring tasks:
     should also be updated, for linking the newly created
     deployment-guide.
 
-    Use the topic ``create-<branchname>`` (e.g: ``create-queens``)
+    Use the topic ``create-<branchname>`` (e.g: ``create-stein``)
     for future reference.
 
   * Branch all the repos that aren't part of the integrated release
@@ -120,7 +120,7 @@ development team by performing one of the following recurring tasks:
     Manually branched repos need extra
     editions, like updating the .gitreview, or the reno index.
     Please reference previous branch creations by using the
-    appropriate topic in gerrit (e.g.: ``create-queens``).
+    appropriate topic in gerrit (e.g.: ``create-stein``).
     The previous new branch creation may be different as the
     tooling/process may have evolved, so be aware that the changes
     needed may need to be adapted.
diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index dd2474a5cc..07612dbd87 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -56,7 +56,7 @@ export INSTALL_METHOD=${3:-"source"}
 # Set the source branch for upgrade tests
 # Be sure to change this whenever a new stable branch
 # is created. The checkout must always be N-1.
-export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/queens'}
+export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/rocky'}
 
 ## Change branch for Upgrades ------------------------------------------------
 # If the action is to upgrade, then store the current SHA,
diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh
index fd7388df22..ee5b6ff9c0 100755
--- a/scripts/run-upgrade.sh
+++ b/scripts/run-upgrade.sh
@@ -34,10 +34,10 @@ export MAIN_PATH="$(dirname "${SCRIPTS_PATH}")"
 export UPGRADE_PLAYBOOKS="${SCRIPTS_PATH}/upgrade-utilities/playbooks"
 
 # The expected source series name
-export SOURCE_SERIES="pike"
+export SOURCE_SERIES="rocky"
 
 # The expected target series name
-export TARGET_SERIES="queens"
+export TARGET_SERIES="stein"
 
 ## Functions -----------------------------------------------------------------
 
diff --git a/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml b/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml
index b77150dba9..d61adc7649 100644
--- a/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml
+++ b/scripts/upgrade-utilities/playbooks/deploy-config-changes.yml
@@ -21,7 +21,7 @@
   vars:
       upgrade_scripts: "{{ playbook_dir }}/../scripts"
       repo_root_dir: "{{ playbook_dir }}/../../../"
-      source_series: "pike"
+      source_series: "rocky"
       ansible_python_interpreter: "/usr/bin/python"
   tasks:
       - name: Create an old copy of openstack_deploy