jenkins.plone.org/master: Move all vagrant related files to an ansible subfolder

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

Move all vagrant related files to an ansible subfolder

Files changed:
A ansible/vagrant/files/credentials.xml
A ansible/vagrant/files/key.priv
A ansible/vagrant/files/key.pub
A ansible/vagrant/files/node.xml
A ansible/vagrant/inventory.txt
A ansible/vagrant/playbook.yml
M Vagrantfile
D etc/jenkins_credentials.xml
D etc/node.xml
D etc/vagrant.priv
D etc/vagrant.pub
D inventory-local.txt
D jenkins_local.yml

diff --git a/Vagrantfile b/Vagrantfile
index f9ded57..f84ed81 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,8 +7,8 @@ Vagrant.configure("2") do |config|
     master.vm.network "private_network", ip: "192.168.50.2"
 
     master.vm.provision "ansible" do |ansible|
-      ansible.inventory_path = "inventory-local.txt"
-      ansible.playbook = "jenkins_local.yml"
+      ansible.inventory_path = "ansible/vagrant/inventory.txt"
+      ansible.playbook = "ansible/vagrant/playbook.yml"
       ansible.limit = "master"
     end
   end
@@ -18,8 +18,8 @@ Vagrant.configure("2") do |config|
     node.vm.network "private_network", ip: "192.168.50.10"
 
     node.vm.provision "ansible" do |ansible|
-      ansible.inventory_path = "inventory-local.txt"
-      ansible.playbook = "jenkins_local.yml"
+      ansible.inventory_path = "ansible/vagrant/inventory.txt"
+      ansible.playbook = "ansible/vagrant/playbook.yml"
       ansible.limit = "node"
     end
   end
diff --git a/etc/jenkins_credentials.xml b/ansible/vagrant/files/credentials.xml
similarity index 100%
rename from etc/jenkins_credentials.xml
rename to ansible/vagrant/files/credentials.xml
diff --git a/etc/vagrant.priv b/ansible/vagrant/files/key.priv
similarity index 100%
rename from etc/vagrant.priv
rename to ansible/vagrant/files/key.priv
diff --git a/etc/vagrant.pub b/ansible/vagrant/files/key.pub
similarity index 100%
rename from etc/vagrant.pub
rename to ansible/vagrant/files/key.pub
diff --git a/etc/node.xml b/ansible/vagrant/files/node.xml
similarity index 100%
rename from etc/node.xml
rename to ansible/vagrant/files/node.xml
diff --git a/inventory-local.txt b/ansible/vagrant/inventory.txt
similarity index 100%
rename from inventory-local.txt
rename to ansible/vagrant/inventory.txt
diff --git a/jenkins_local.yml b/ansible/vagrant/playbook.yml
similarity index 91%
rename from jenkins_local.yml
rename to ansible/vagrant/playbook.yml
index 47ec5f7..32620ce 100644
--- a/jenkins_local.yml
+++ b/ansible/vagrant/playbook.yml
@@ -24,7 +24,7 @@
     pillow: true
     lxml: true
   vars_files:
-    - secrets.yml
+    - ../secrets.yml
 
   tasks:
     # most probably this vagrant box will not have a public Internet IP
@@ -40,7 +40,7 @@
     - name: 'Override node configuration'
       become: yes
       copy:
-        src=etc/node.xml
+        src=files/node.xml
         dest=/var/lib/jenkins/nodes/node/config.xml
         owner=jenkins
         group=jenkins
@@ -48,7 +48,7 @@
     - name: 'Add dummy private key'
       become: yes
       copy:
-        src=etc/vagrant.priv
+        src=files/key.priv
         dest=/var/lib/jenkins/private_key
         owner=jenkins
         group=jenkins
@@ -56,7 +56,7 @@
     - name: 'Add credentials.xml'
       become: yes
       copy:
-        src=etc/jenkins_credentials.xml
+        src=files/credentials.xml
         dest=/var/lib/jenkins/credentials.xml
         owner=jenkins
         group=jenkins
@@ -73,4 +73,4 @@
       become: yes
       authorized_key:
         user=jenkins
-        key="{{ lookup('file', 'etc/vagrant.pub') }}"
+        key="{{ lookup('file', 'files/key.pub') }}"



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