From d3c02bbbe69ebc24d12fcebd798ddadda633d589 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Fri, 15 Jan 2016 11:33:02 -0500 Subject: [PATCH] Modify docs to more strongly suggest deploying repo-infra_hosts This change implements documentation changes discussed during the weekly meeting on January 14, 2016 on freenode in #openstack-meeting-4 Currently, documentation suggests configuring the user variable openstack_repo_url: "https://rpc-repo.rackspace.com/" The repos maintained on https://rpc-repo.rackspace.com/ do not currently support individual point releases (such as 12.0.3 at the time of this writing). Releases are supported by name in that repo, such as 'liberty', 'master', or 'kilo'. This change advocates more strongly for the use of deploying repo-infra_hosts, and in the alternative, asks the user to specify the user variable openstack_release to avoid problems with point releases in the repository until a time they are implemented upstream. Change-Id: I36f8893fcd7cb8d6ddbce06b7974e3b16be91b5f --- doc/source/install-guide/configure-hostlist.rst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/source/install-guide/configure-hostlist.rst b/doc/source/install-guide/configure-hostlist.rst index 7286f21cee..96a4f04628 100644 --- a/doc/source/install-guide/configure-hostlist.rst +++ b/doc/source/install-guide/configure-hostlist.rst @@ -132,17 +132,22 @@ suitable short hostname for a compute host might be: container management bridge on each repository target host. The repository typically resides on one or more infrastructure hosts. - Alternatively, specify a value for the ``openstack_repo_url`` variable - in the ``/etc/openstack_deploy/user_group_vars.yml`` file. The value should - contain a URL for a host with the appropriate repository layout. For + Alternatively, specify a value for the variables ``openstack_repo_url`` + and ``openstack_release`` in the + ``/etc/openstack_deploy/user_group_vars.yml`` file. The values should + contain a URL for a host with the appropriate repository layout and + the desired OpenStack release, respectively. For example: .. code-block:: yaml openstack_repo_url: "https://rpc-repo.rackspace.com/" + openstack_release: master Using ``repo-infra_hosts`` configures a local repository with the - appropriate layout and sets ``openstack_repo_url`` for you. + appropriate layout and sets ``openstack_repo_url`` and + ``openstack_release`` for you. Using ``repo-infra_hosts`` is the + preferred method of configuring the repository. #. Configure a list containing at least one optional storage host in the ``storage_hosts`` section: