Update docs & upgrade scripts for Rocky

This is not a clean pick - it's been adjusted to cater
to Queens->Rocky rather than Rocky->Stein.

Closes-Bug: #1790158
Change-Id: I37d8c90dedf0cf9e36c913ba7541440b9964e631
(cherry picked from commit 6e8904062f)
This commit is contained in:
Florian Haas 2018-08-31 10:03:02 +02:00 committed by Jesse Pretorius
parent 384abae972
commit 8524b675e5
4 changed files with 7 additions and 7 deletions

View File

@ -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/rocky/install/verify.html>_`.
and `Manage Images
<https://docs.openstack.org/glance/queens/admin/manage-images.html>_`
<https://docs.openstack.org/glance/rocky/admin/manage-images.html>_`
RabbitMQ issues
~~~~~~~~~~~~~~~

View File

@ -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-rocky``)
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-rocky``).
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.

View File

@ -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="queens"
# The expected target series name
export TARGET_SERIES="queens"
export TARGET_SERIES="rocky"
## Functions -----------------------------------------------------------------

View File

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