From 1ee04846f68874c56610552885b5a58295ef4879 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 31 Aug 2018 15:18:00 +0100 Subject: [PATCH] Fix command for copying the Kayobe configuration There were two problems with this command. First, we needed to copy the etc/kayobe directory instead of just etc, to avoid generating an extra layer of kayobe directories. Second, its behavior was different depending on whether the target directory already existed or not: instead, copying files under etc/kayobe always produces a predictable result. Change-Id: I3923e1fad2e1e9a5b206db93d48c08545cbdccef --- doc/source/configuration/kayobe.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/source/configuration/kayobe.rst b/doc/source/configuration/kayobe.rst index 528f9c0f8..7c5b0fdde 100644 --- a/doc/source/configuration/kayobe.rst +++ b/doc/source/configuration/kayobe.rst @@ -71,7 +71,8 @@ should be merged to incorporate any upstream changes with local modifications. Alternatively, the baseline Kayobe configuration may be copied from a checkout of the Kayobe repository to the Kayobe configuration path:: - $ cp -r etc/ ${KAYOBE_CONFIG_PATH:-/etc/kayobe} + $ mkdir -p ${KAYOBE_CONFIG_PATH:-/etc/kayobe/} + $ cp -r etc/kayobe/* ${KAYOBE_CONFIG_PATH:-/etc/kayobe/} Once in place, each of the YAML and inventory files should be manually inspected and configured as required.