openstack/kayobe
Code Issues Proposed changes

Merge "Update kayobe-config repo URL to openstack/kayobe-config"

Browse Source
This commit is contained in:
Zuul 2018-05-24 10:03:43 +00:00 committed by Gerrit Code Review
commit 1b8c98ff24
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/configuration/kayobe.rst
View File

@ -62,8 +62,8 @@ variables.
Configuring Kayobe Configuring Kayobe
================== ==================
The `kayobe-config <https://github.com/stackhpc/kayobe-config>`_ git repository The `kayobe-config <https://github.com/openstack/kayobe-config>`_ git
contains a Kayobe configuration directory structure and unmodified repository contains a Kayobe configuration directory structure and unmodified
configuration files. This repository can be used as a mechanism for version configuration files. This repository can be used as a mechanism for version
controlling Kayobe configuration. As Kayobe is updated, the configuration controlling Kayobe configuration. As Kayobe is updated, the configuration
should be merged to incorporate any upstream changes with local modifications. should be merged to incorporate any upstream changes with local modifications.

2
doc/source/upgrading.rst
View File

@ -33,7 +33,7 @@ Migrating Kayobe Configuration
Kayobe configuration options may be changed between releases of kayobe. Ensure Kayobe configuration options may be changed between releases of kayobe. Ensure
that all site local configuration is migrated to the target version format. If that all site local configuration is migrated to the target version format. If
using the `kayobe-config <https://github.com/stackhpc/kayobe-config>`_ git using the `kayobe-config <https://github.com/openstack/kayobe-config>`_ git
repository to manage local configuration, this process can be managed via git. repository to manage local configuration, this process can be managed via git.
For example, to fetch version 1.0.0 of the configuration from the ``origin`` For example, to fetch version 1.0.0 of the configuration from the ``origin``
remote and merge it into the current branch:: remote and merge it into the current branch::