From 0752c582ca1c500c539830c15ca6d1c6ec08ab6c Mon Sep 17 00:00:00 2001 From: David Stephens Date: Wed, 8 Jan 2020 16:12:03 +0000 Subject: [PATCH] Rejig config/yml structure --- docs/installation.md | 2 +- group_vars/all.yml | 2 +- inventories/sample/group_vars/{all.yml => nas.yml} | 0 inventories/sample/inventory | 9 ++++++--- 4 files changed, 8 insertions(+), 5 deletions(-) rename inventories/sample/group_vars/{all.yml => nas.yml} (100%) diff --git a/docs/installation.md b/docs/installation.md index bf31f689..42a9e85c 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -21,7 +21,7 @@ You can run Ansible-NAS from the computer you plan to use for your NAS, or from `cp -rfp inventories/sample inventories/my-ansible-nas` -5. Review `group_vars/all.yml`. Change settings by overriding them in `inventories/my-ansible-nas/group_vars/all.yml`. +5. Review `group_vars/all.yml`. Change settings by overriding them in `inventories/my-ansible-nas/group_vars/nas.yml`. 6. Update `inventories/my-ansible-nas/inventory`. diff --git a/group_vars/all.yml b/group_vars/all.yml index abbbbb8d..209f358c 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -8,7 +8,7 @@ ### ### DO NOT EDIT THIS FILE! -### Add your customisations to inventories//group_vars/all.yml +### Add your customisations to inventories//group_vars/nas.yml ### ### diff --git a/inventories/sample/group_vars/all.yml b/inventories/sample/group_vars/nas.yml similarity index 100% rename from inventories/sample/group_vars/all.yml rename to inventories/sample/group_vars/nas.yml diff --git a/inventories/sample/inventory b/inventories/sample/inventory index 11b9a776..e7efa92c 100644 --- a/inventories/sample/inventory +++ b/inventories/sample/inventory @@ -6,10 +6,13 @@ ## \/ \/ \/ \/ \/ \/ \/ \/ ## a n s i b l e - n a s https://github.com/davestephens/ansible-nas + [all] +## Example when running from a remote workstation +# ansible-nas ansible_host=192.168.1.30 ## Example when running directly on your Ansible-NAS server -# localhost ansible_connection=local +# ansible-nas ansible_connection=local ansible_host=localhost -## Example when running from a remote workstation -# 192.168.1.30 \ No newline at end of file +[nas] +ansible-nas \ No newline at end of file