openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Update Liberty related documentation throughout roles"

This commit is contained in:
Jenkins 2017-01-05 12:11:46 +00:00 committed by Gerrit Code Review
parent 590ffae451 18eb1d3c3b
commit ecf1f40611
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/baremetal-undercloud/README.md
View File

@ -48,7 +48,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

4
roles/overcloud-scale/README.md
View File

@ -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
--------------

9
roles/overcloud-upgrade/doc/upgrade.rst
View File

@ -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
`````````````````

2
roles/validate-ha/README.md
View File

@ -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

4
roles/validate-simple/templates/overcloud-validate.sh.j2
View File

@ -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