From 18eb1d3c3bf0aae9192074149da09b2c651179fb Mon Sep 17 00:00:00 2001 From: Harry Rybacki Date: Tue, 29 Nov 2016 13:39:02 -0500 Subject: [PATCH] Update Liberty related documentation throughout roles Change-Id: Ifc581a654a4a763f1638bda12712dc35c28dbe2c --- roles/baremetal-undercloud/README.md | 2 +- roles/overcloud-scale/README.md | 4 ++-- roles/overcloud-upgrade/doc/upgrade.rst | 9 ++++----- roles/validate-ha/README.md | 2 +- roles/validate-simple/templates/overcloud-validate.sh.j2 | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/roles/baremetal-undercloud/README.md b/roles/baremetal-undercloud/README.md index e9acb6da5..fedd281e6 100644 --- a/roles/baremetal-undercloud/README.md +++ b/roles/baremetal-undercloud/README.md @@ -49,7 +49,7 @@ Basically this command: * Uses a custom workdir that is rebuilt from scratch (so if it already exists, it is dropped, see *--clean*) * Get all the extra requirements * Select the config file -* Chooses release (liberty, mitaka or “master” for newton) +* Chooses release (liberty, mitaka, newton, or “master” for ocata) * Performs all the tasks in the playbook * Starts the installation on virthost diff --git a/roles/overcloud-scale/README.md b/roles/overcloud-scale/README.md index 4998ad2f5..5393cea5a 100644 --- a/roles/overcloud-scale/README.md +++ b/roles/overcloud-scale/README.md @@ -6,9 +6,9 @@ An Ansible role for scaling and deleting nodes from an overcloud. Requirements ------------ -This role assumes it will be executed against a host on which a Liberty or Mitaka under/overcloud have already been deployed. +This role assumes it will be executed against a host on which a Liberty, Mitaka, Newton, or Ocata under/overcloud have already been deployed. -**Note:** The ansible-role-tripleo-overcloud-validate role must be accessible. +**Note:** The validate-simple role must be accessible. Role Variables -------------- diff --git a/roles/overcloud-upgrade/doc/upgrade.rst b/roles/overcloud-upgrade/doc/upgrade.rst index cb1eb0304..c1fbf2179 100644 --- a/roles/overcloud-upgrade/doc/upgrade.rst +++ b/roles/overcloud-upgrade/doc/upgrade.rst @@ -40,11 +40,10 @@ execute the pre tasks for undercloud and overcloud. Parameters ---------- -The upgrade role takes severals parameters as input. All those values are stored -under default/main.yml. -All of those values could be overriden. -With the default values, you can upgrade a basic Tripleo environment from Liberty -to Mitaka +The upgrade role takes several parameters as input -- defaults are located +in default/main.yml. All of these values can be overriden. +With the default values, you can upgrade a basic TripleO environment from Liberty +to Mitaka. Common Parameters ````````````````` diff --git a/roles/validate-ha/README.md b/roles/validate-ha/README.md index 32f2b5462..18329d164 100644 --- a/roles/validate-ha/README.md +++ b/roles/validate-ha/README.md @@ -40,7 +40,7 @@ Basically this command: - Uses the same custom workdir where quickstart was first deployed - Get all the extra requirements - Select the specific config file (which must contain the floating network data) -- Specifies the release (liberty, mitaka, newton or “master” for ocata) +- Specifies the release (liberty, mitaka, newton, or “master” for ocata) - Performs all the tasks in the playbook overcloud-validate-ha.yml - Starts the installation on virthost diff --git a/roles/validate-simple/templates/overcloud-validate.sh.j2 b/roles/validate-simple/templates/overcloud-validate.sh.j2 index 8a568e635..9d1479fcc 100644 --- a/roles/validate-simple/templates/overcloud-validate.sh.j2 +++ b/roles/validate-simple/templates/overcloud-validate.sh.j2 @@ -68,8 +68,8 @@ openstack image create {{ validate_image_name }} --public --container-format ami ## * Create external network -## .. note: Liberty comparability: -## (heat can't create an external network in liberty) +## .. note: Liberty compatibility: +## (heat can't create an external network in Liberty) ## :: if ! neutron net-list | grep 'nova'; then