From 97905f98b6850b54a305a02aaba5380e90276265 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 21 May 2018 09:14:41 +0100 Subject: [PATCH] Update kayobe-config repo URL to openstack/kayobe-config The kayobe-config repo is now under the openstack git namespace. Change-Id: I3e29d33accc947473d0d2c6a01f2c1d5c823a197 Story: 2001637 Task: 19738 --- doc/source/configuration/kayobe.rst | 4 ++-- doc/source/upgrading.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/configuration/kayobe.rst b/doc/source/configuration/kayobe.rst index 4dd43fd7a..f0ccdb022 100644 --- a/doc/source/configuration/kayobe.rst +++ b/doc/source/configuration/kayobe.rst @@ -62,8 +62,8 @@ variables. Configuring Kayobe ================== -The `kayobe-config `_ git repository -contains a Kayobe configuration directory structure and unmodified +The `kayobe-config `_ git +repository contains a Kayobe configuration directory structure and unmodified configuration files. This repository can be used as a mechanism for version controlling Kayobe configuration. As Kayobe is updated, the configuration should be merged to incorporate any upstream changes with local modifications. diff --git a/doc/source/upgrading.rst b/doc/source/upgrading.rst index 81f551c1b..3f827257c 100644 --- a/doc/source/upgrading.rst +++ b/doc/source/upgrading.rst @@ -33,7 +33,7 @@ Migrating Kayobe Configuration Kayobe configuration options may be changed between releases of kayobe. Ensure that all site local configuration is migrated to the target version format. If -using the `kayobe-config `_ git +using the `kayobe-config `_ 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`` remote and merge it into the current branch::