From d44c43aef34b658d893a911589ea87c35d5c36dc Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 12 Apr 2017 22:58:55 -0400 Subject: [PATCH] move optional packages to extras dir Signed-off-by: Bill Erickson --- README.adoc | 23 ++++++++++++++++++----- evergreen/main.yml | 6 ------ extras/main.yml | 6 ++++++ {evergreen => extras}/nginx.yml | 0 {evergreen => extras}/rsyslog.yml | 0 playbook.yml | 5 ++++- 6 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 extras/main.yml rename {evergreen => extras}/nginx.yml (100%) rename {evergreen => extras}/rsyslog.yml (100%) diff --git a/README.adoc b/README.adoc index c915a2442..46f6af2b1 100644 --- a/README.adoc +++ b/README.adoc @@ -1,14 +1,27 @@ = Evergreen / OpenSRF Ansible Installer -== settings.yml - -Review the values contained in setting.yml and modify as needed. - -== Running +== Quick How-To [source,sh] --------------------------------------------------------------------------- sudo ansible-playbook playbook.yml -e "hosts=127.0.0.1" --------------------------------------------------------------------------- +== File Structure + +=== playbook.yml + +Main playbook. Run this. + +=== settings.yml + +Installation settings. This should be the only file that needs changing. + +=== */main.yml + +Entry point for each collection of sub-tasks. + +=== extras + +Optional packages not strictly required for OpenSRF and Evergreen. diff --git a/evergreen/main.yml b/evergreen/main.yml index 2043448f6..0d8f1f2bd 100644 --- a/evergreen/main.yml +++ b/evergreen/main.yml @@ -4,14 +4,8 @@ include: eg-web.yml - name: Install Evergreen include: eg-install.yml -- name: Setup Rsyslog - include: rsyslog.yml - when: use_rsyslog - name: Setup Apache include: apache.yml -- name: Install Nginx - include: nginx.yml - when: use_nginx - name: Install Database include: database.yml when: install_database diff --git a/extras/main.yml b/extras/main.yml new file mode 100644 index 000000000..37899edc3 --- /dev/null +++ b/extras/main.yml @@ -0,0 +1,6 @@ +- name: Setup Rsyslog + include: rsyslog.yml + when: use_rsyslog +- name: Install Nginx + include: nginx.yml + when: use_nginx diff --git a/evergreen/nginx.yml b/extras/nginx.yml similarity index 100% rename from evergreen/nginx.yml rename to extras/nginx.yml diff --git a/evergreen/rsyslog.yml b/extras/rsyslog.yml similarity index 100% rename from evergreen/rsyslog.yml rename to extras/rsyslog.yml diff --git a/playbook.yml b/playbook.yml index 1fd7692ea..0469bdb28 100644 --- a/playbook.yml +++ b/playbook.yml @@ -1,4 +1,5 @@ -## +# OpenSRF / Evergreen Ansible Installer Playbook +# Author: Bill Erickson - hosts: '{{hosts}}' connection: local @@ -12,3 +13,5 @@ include: opensrf/main.yml - name: Process Evergreen Tasks include: evergreen/main.yml + - name: Process Optional Packages + include: extras/main.yml -- 2.11.0