From ce11216a0ee43cc623c1a33d1b1b0f78097d2745 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Thu, 29 Sep 2016 16:17:48 +0200
Subject: Improve playbook to setup gate nodes

* use become instead of sudo
* use file instead of shell to change file modes
* rename setup_nodes.yml to playbook-setup-nodes.yml

Change-Id: I69eda1f034b97d13be76efc91458b6d762c76baf
---
 tools/playbook-setup-nodes.yml | 41 +++++++++++++++++++++++++++++++++++++++++
 tools/setup_gate.sh            |  2 +-
 tools/setup_nodes.yml          | 35 -----------------------------------
 3 files changed, 42 insertions(+), 36 deletions(-)
 create mode 100644 tools/playbook-setup-nodes.yml
 delete mode 100644 tools/setup_nodes.yml

(limited to 'tools')

diff --git a/tools/playbook-setup-nodes.yml b/tools/playbook-setup-nodes.yml
new file mode 100644
index 000000000..19bdf56b4
--- /dev/null
+++ b/tools/playbook-setup-nodes.yml
@@ -0,0 +1,41 @@
+---
+- hosts: all
+  become: true
+
+  tasks:
+  - name: Setup /etc/hosts
+    copy:
+      src: /etc/hosts
+      dest: /etc/hosts
+
+  - name: Ensure /etc/hostname is valid for SELinux
+    command: restorecon -v /etc/hostname
+    when: ansible_os_family == 'RedHat'
+
+  - name: Assign hostname
+    hostname:
+      name: "{{ inventory_hostname }}"
+
+  - name: Copy setup script
+    copy:
+      src: setup_{{ ansible_os_family }}.sh
+      dest: /tmp/setup.sh
+      mode: 0755
+
+- hosts: all
+  become: true
+
+  tasks:
+  - name: Create log directory for node
+    file:
+      state: directory
+      path: /tmp/{{ inventory_hostname }}
+    become: false
+
+  - name: Run node setup
+    shell: /tmp/setup.sh
+
+  - name: Changing permissions of Docker socket to 666
+    file:
+      path: /run/docker.sock
+      mode: 0666
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 47fcadce2..e0cf52764 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -132,7 +132,7 @@ EOF
 }
 
 function setup_node {
-    ansible-playbook -i ${RAW_INVENTORY} tools/setup_nodes.yml
+    ansible-playbook -i ${RAW_INVENTORY} tools/playbook-setup-nodes.yml
 }
 
 function setup_logging {
diff --git a/tools/setup_nodes.yml b/tools/setup_nodes.yml
deleted file mode 100644
index b61f126df..000000000
--- a/tools/setup_nodes.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- hosts: all
-  sudo: yes
-  tasks:
-  - name: Setup /etc/hosts
-    copy:
-      src: /etc/hosts
-      dest: /etc/hosts
-
-  - name: Ensure /etc/hostname is valid for SELinux
-    command: restorecon -v /etc/hostname
-    when: ansible_os_family == 'RedHat'
-
-  - name: Assign hostname
-    hostname:
-      name: "{{ inventory_hostname }}"
-
-  - name: Copy setup script
-    copy:
-      src: setup_{{ ansible_os_family }}.sh
-      dest: /tmp/setup.sh
-      mode: 0755
-
-- hosts: all
-  tasks:
-  - name: Create log directory for node
-    file:
-      state: directory
-      path: /tmp/{{ inventory_hostname }}
-
-  - name: Run node setup
-    shell: sudo /tmp/setup.sh
-
-  - name: Changing permissions of docker socket to 666
-    shell: sudo chmod 0666 /run/docker.sock
-- 
cgit v1.2.3