jenkins.plone.org/new-structure: Move all ansible related files to a folder

Repository: jenkins.plone.org
Branch: refs/heads/new-structure
Date: 2017-07-22T18:19:47+02:00
Author: Gil Forcada (gforcada) <[email protected]>
Commit: https://github.com/plone/jenkins.plone.org/commit/b260c215a908dbdf11fcf7fd3328d906c34d20da

Move all ansible related files to a folder

The top level folder is too crowded and filenames are too generic to know what they contain.

Files changed:
A ansible/inventory.txt
A ansible/node.yml
A ansible/roles.yml
A ansible/secrets.yml.in
A ansible/server.yml
M .gitignore
M ansible.cfg
M docs/source/setup.rst
M update_master.sh
M update_nodes.sh
D inventory.txt
D jenkins_node.yml
D jenkins_server.yml
D roles.yml
D secrets.yml.in

diff --git a/.gitignore b/.gitignore
index dc99d56..7ba3c8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 jenkins.ini
-secrets.yml
+ansible/secrets.yml
 auth.py
 /develop-eggs
 /eggs
@@ -28,4 +28,4 @@ docs/Makefile
 docs/make.bat
 docs/doctrees
 docs/html
-roles/
+ansible/roles/
diff --git a/ansible.cfg b/ansible.cfg
index 89c30f2..1880ea6 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,3 +1,3 @@
 [defaults]
-roles_path = roles
-hostfile = inventory.txt
+roles_path = ansible/roles
+hostfile = ansible/inventory.txt
diff --git a/inventory.txt b/ansible/inventory.txt
similarity index 100%
rename from inventory.txt
rename to ansible/inventory.txt
diff --git a/jenkins_node.yml b/ansible/node.yml
similarity index 100%
rename from jenkins_node.yml
rename to ansible/node.yml
diff --git a/roles.yml b/ansible/roles.yml
similarity index 100%
rename from roles.yml
rename to ansible/roles.yml
diff --git a/secrets.yml.in b/ansible/secrets.yml.in
similarity index 100%
rename from secrets.yml.in
rename to ansible/secrets.yml.in
diff --git a/jenkins_server.yml b/ansible/server.yml
similarity index 100%
rename from jenkins_server.yml
rename to ansible/server.yml
diff --git a/docs/source/setup.rst b/docs/source/setup.rst
index 6b9f9bf..b8a8201 100644
--- a/docs/source/setup.rst
+++ b/docs/source/setup.rst
@@ -31,10 +31,10 @@ Install all the tools needed (ansible, ansible roles and jenkins-job-builder):
 .. code-block:: shell
 
     $ pip install -r requirements.txt
-    $ ansible-galaxy install -r roles.yml
+    $ ansible-galaxy install -r ansible/roles.yml
     $ git submodule update --init
 
-Check inventory.txt and make sure that you can connect to the machines listed there.
+Check ansible/inventory.txt and make sure that you can connect to the machines listed there.
 
 Copy your public ssh key to all servers:
 
@@ -87,11 +87,11 @@ Add your own credentials to jenkins.ini.
 You can find them when you log into Jenkins and copy your API token
 (e.g. http://jenkins.plone.org/user/tisto/configure).
 
-Create your own ``secrets.yml`` by copying it from ``secrets.yml.in``:
+Create your own ``ansible/secrets.yml`` by copying it from ``ansible/secrets.yml.in``:
 
 .. code-block:: shell
 
-    $ cp secrets.yml.in secrets.yml
+    $ cp ansible/secrets.yml.in ansible/secrets.yml
 
 Add github API secrets that are needed for the github login functionality on jenkins.plone.org.
 You can find those settings on plone organization in github:
diff --git a/update_master.sh b/update_master.sh
index 143456b..f5e026e 100755
--- a/update_master.sh
+++ b/update_master.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-ansible-playbook --limit jenkins_server -i inventory.txt jenkins_server.yml
+ansible-playbook --limit jenkins_server -i ansible/inventory.txt ansible/server.yml
diff --git a/update_nodes.sh b/update_nodes.sh
index 87dace6..d382320 100755
--- a/update_nodes.sh
+++ b/update_nodes.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-ansible-playbook --limit jenkins_nodes -i inventory.txt jenkins_node.yml
+ansible-playbook --limit jenkins_nodes -i ansible/inventory.txt ansible/node.yml



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot