From cd1996a8fffcb1d5ce44bea785241acab345326b Mon Sep 17 00:00:00 2001 From: Sasha Ames Date: Wed, 23 Jun 2021 13:54:44 -0700 Subject: [PATCH 1/3] correct instructions regarding branch info. --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index b3b63b93..a944936f 100644 --- a/README.md +++ b/README.md @@ -71,11 +71,6 @@ git clone https://github.com/ESGF/esgf-docker.git cd esgf-docker ``` -These changes have not yet been committed to `master`, so you will need to check out the development branch: - -```sh -git checkout future-architecture -``` Then follow the deployment guide for your chosen deployment method: From 67ba0c84c3edef68dbe84e8be122b0ca4b00af69 Mon Sep 17 00:00:00 2001 From: Sasha Ames Date: Fri, 4 Mar 2022 16:06:30 -0800 Subject: [PATCH 2/3] first pass --- docs/deploy-ansible.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/deploy-ansible.md b/docs/deploy-ansible.md index 8066c266..9b2ba86b 100644 --- a/docs/deploy-ansible.md +++ b/docs/deploy-ansible.md @@ -27,11 +27,16 @@ configurations. +## Prerequisites + +The prerequisites for running the Ansible node are similar to the existing node requirements. Specifically, the assumed target host for deployment assumes a RHEL 7 or CentOS 7 deployment. Additionally, the playbook operator must have full host control with sudo / root access. You may want to familiarize yourself with additional requirements here https://esgf.github.io/esgf-ansible/requirements/requirements.html#system + ## Running the playbook Before attempting to run the playbook, make sure that you have [installed Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html). + Next, make a configuration directory - this can be anywhere on your machine that is **not** under `esgf-docker`. You can also place this directory under version control if you wish - this can be very useful for tracking changes to the configuration, or even triggering deployments automatically when From c3118db78f3d803362f214ac7a7e2b6ce36f8f77 Mon Sep 17 00:00:00 2001 From: Sasha Ames Date: Fri, 4 Mar 2022 16:07:43 -0800 Subject: [PATCH 3/3] clarify prereq paragr --- docs/deploy-ansible.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deploy-ansible.md b/docs/deploy-ansible.md index 9b2ba86b..912010f7 100644 --- a/docs/deploy-ansible.md +++ b/docs/deploy-ansible.md @@ -29,7 +29,7 @@ configurations. ## Prerequisites -The prerequisites for running the Ansible node are similar to the existing node requirements. Specifically, the assumed target host for deployment assumes a RHEL 7 or CentOS 7 deployment. Additionally, the playbook operator must have full host control with sudo / root access. You may want to familiarize yourself with additional requirements here https://esgf.github.io/esgf-ansible/requirements/requirements.html#system +The prerequisites for running the Ansible node with Docker containers are similar to the node requirements for the classic deployment of ESGF services (without the use of containers). Specifically, the assumed target host for deployment assumes a RHEL 7 or CentOS 7 deployment. Additionally, the playbook operator must have full host control with sudo / root access. You may want to familiarize yourself with additional requirements here https://esgf.github.io/esgf-ansible/requirements/requirements.html#system ## Running the playbook