summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-03-24 15:29:13 +0100
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-03-25 13:08:40 +0100
commit8d133021ad9b2b8e0553d45e19ad9d5c34a36634 (patch)
tree51db2310200225aac264e85fa05eac7407d9fc18
parentb212cf4c0e34df758ec7a2e44503ea43882e0dec (diff)
Update the appendix in install guide
Change-Id: I3ce931f5336b4b80ce27af383b18e65d7c0dd71a Issue-ID: INT-1893 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
-rw-r--r--docs/InstallGuide.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/InstallGuide.rst b/docs/InstallGuide.rst
index 37706dc9..30451f2e 100644
--- a/docs/InstallGuide.rst
+++ b/docs/InstallGuide.rst
@@ -470,9 +470,9 @@ There are two ways how to easily run the installer's ansible playbooks:
(Re)build docker image and/or chroot archive
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Inside the ``'docker'`` directory is the ``'Dockerfile'`` and ``'build_ansible_image.sh'`` script. You can run ``'build_ansible_image.sh'`` script on some machine with the internet connectivity and it will download all required packages needed for building the ansible docker image and for exporting it into a flat chroot environment.
+Inside the ``'ansible/docker'`` directory you'll find the ``'Dockerfile'`` and ``'build_ansible_image.sh'`` script. You can run ``'build_ansible_image.sh'`` script on some machine with the internet connectivity and it will download all required packages needed for building the ansible docker image and for exporting it into a flat chroot environment.
-Built image is exported into ``'ansible_chroot.tgz'`` archive in the same (``'docker'``) directory.
+Built image is exported into ``'ansible_chroot.tgz'`` archive in the same (``'ansible/docker'``) directory.
This script has two optional arguments:
@@ -486,7 +486,7 @@ Launching ansible playbook using chroot environment
This is the default and preferred way of running ansible playbooks in an offline environment as there is no dependency on docker to be installed on the system. Chroot environment is already provided by included archive ``'ansible_chroot.tgz'``.
-It should be available in the ``'docker'`` directory as the end-result of the packaging script or after manual run of the ``'build_ansible_image.sh'`` script referenced above.
+It should be available in the ``'ansible/docker'`` directory as the end-result of the packaging script or after manual run of the ``'build_ansible_image.sh'`` script referenced above.
All playbooks can be executed via ``'./run_playbook.sh'`` wrapper script.
@@ -506,16 +506,16 @@ Developers notes
* Second script will automate chrooting (necessary steps for chroot to work and cleanup)
* Both of them have help - just run::
- $ cd docker
+ $ cd ansible/docker
$ ./create_docker_chroot.sh help
$ ./run_chroot.sh help
Example usage::
$ sudo su
- $ docker/create_docker_chroot.sh convert some_docker_image ./new_name_for_chroot
+ $ ansible/docker/create_docker_chroot.sh convert some_docker_image ./new_name_for_chroot
$ cat ./new_name_for_chroot/README.md
- $ docker/run_chroot.sh execute ./new_name_for_chroot cat /etc/os-release 2>/dev/null
+ $ ansible/docker/run_chroot.sh execute ./new_name_for_chroot cat /etc/os-release 2>/dev/null
Launching ansible playbook using docker container (ALTERNATIVE APPROACH)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~