Update docs/tooling for Queens

In the upgrade tooling and the docs references we use
the series name in a few places. This updates them all
for development in the Queens cycle.

In the docs there are many references to Ocata manuals
which are left alone as the upstream Pike docs have not
been published yet.

Change-Id: Ice2169bd40f5712dd9ec9a9eb946fe0244f32294
This commit is contained in:
Jesse Pretorius 2017-08-23 07:47:37 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 4d39f2cc29
commit 956e829111
6 changed files with 24 additions and 11 deletions

View File

@ -296,8 +296,8 @@ pdf_documents = [
latest_tag = os.popen('git describe --abbrev=0 --tags').read().strip('\n')
previous_release_branch_name='ocata'
current_release_branch_name='pike'
previous_release_branch_name='pike'
current_release_branch_name='queens'
# Var specifically for using in URLs; differs because it might be 'draft'
# on master for deploy guide
deploy_branch_link_name = current_release_branch_name

View File

@ -301,8 +301,8 @@ pdf_documents = [
latest_tag = os.popen('git describe --abbrev=0 --tags').read().strip('\n')
# Used for the upgrade documentation
previous_release_branch_name = 'ocata'
current_release_branch_name = 'pike'
previous_release_branch_name = 'pike'
current_release_branch_name = 'queens'
# dev docs have no branch specified on master; for stable braches it's "/branch/"
watermark = os.popen("git branch --contains $(git rev-parse HEAD) | awk -F/ '/stable/ {print $2}'").read().strip(' \n\t').capitalize()

View File

@ -9,10 +9,10 @@ configuration of an OpenStack environment.
Documentation for each of the following releases is available.
Pike: Pre-release
~~~~~~~~~~~~~~~~~
Queens: Pre-release
~~~~~~~~~~~~~~~~~~~
OpenStack-Ansible Pike is currently in development.
OpenStack-Ansible Queens is currently in development.
.. toctree::
:maxdepth: 1
@ -24,6 +24,19 @@ OpenStack-Ansible Pike is currently in development.
contributor/index
reference/index
Pike: Release Candidate
~~~~~~~~~~~~~~~~~~~~~~~
OpenStack-Ansible Pike is currently a release candidate, expected to release
with the 16.0.0 tag by 15 September 2017.
* `OpenStack-Ansible Pike Documentation`_
* `OpenStack-Ansible Pike series release notes`_
.. _OpenStack-Ansible Pike Documentation: https://docs.openstack.org/openstack-ansible/pike/
.. _OpenStack-Ansible Pike series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/pike.html
Ocata: Current stable release, security supported
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

View File

@ -53,7 +53,7 @@ export ACTION=${2:-"deploy"}
# 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/ocata'}
export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/pike'}
## Change branch for Upgrades ------------------------------------------------
# If the action is to upgrade, then store the current SHA,

View File

@ -37,10 +37,10 @@ export UPGRADE_PLAYBOOKS="${SCRIPTS_PATH}/upgrade-utilities/playbooks"
export I_REALLY_KNOW_WHAT_I_AM_DOING=${I_REALLY_KNOW_WHAT_I_AM_DOING:-"false"}
# The expected source series name
export SOURCE_SERIES="ocata"
export SOURCE_SERIES="pike"
# The expected target series name
export TARGET_SERIES="pike"
export TARGET_SERIES="queens"
## Functions -----------------------------------------------------------------

View File

@ -21,7 +21,7 @@
vars:
upgrade_scripts: "{{ playbook_dir }}/../scripts"
repo_root_dir: "{{ playbook_dir }}/../../../"
source_series: "ocata"
source_series: "pike"
ansible_python_interpreter: "/usr/bin/python"
tasks:
- name: Create an old copy of openstack_deploy