From: Samuli Silvius <s.silvius@partner.samsung.com>
Date: Tue, 19 Feb 2019 16:07:02 +0000 (+0200)
Subject: Create setup role
X-Git-Tag: 6.0.0-ONAP~304^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6fd567082d827378547d41eb9a83ce41164a4d12;p=oom%2Foffline-installer.git

Create setup role

Creating setup role and moving functionality from setup playbook
into new role.
This will make roles easier to test
and make it easier to implement other OS support later.

Issue-ID: OOM-1663

Change-Id: If8b93066997c2442c0b94cb2a95fb535d9560b2b
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
---

diff --git a/ansible/roles/setup/defaults/main.yml b/ansible/roles/setup/defaults/main.yml
new file mode 100644
index 00000000..e7e89721
--- /dev/null
+++ b/ansible/roles/setup/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+ssh_dir: ~/.ssh
+offline_ssh_key_file_name: offline_ssh_key
\ No newline at end of file
diff --git a/ansible/roles/setup/tasks/main.yml b/ansible/roles/setup/tasks/main.yml
new file mode 100644
index 00000000..5ffcbab9
--- /dev/null
+++ b/ansible/roles/setup/tasks/main.yml
@@ -0,0 +1,30 @@
+---
+- name: "Check and generate key if needed"
+  block:
+    - name: ssh dir
+      file:
+        path: "{{ ssh_dir }}"
+        state: directory
+        mode: 0700
+
+    - name: check ssh pub key exists
+      stat:
+        path: '{{ private_key }}.pub'
+      register: p
+
+    - name: generate ssh keys
+      command: ssh-keygen -f {{ private_key }} -t rsa -N ''
+      when: not p.stat.exists
+  vars:
+    private_key: "{{ ssh_dir }}/{{ offline_ssh_key_file_name }}"
+  delegate_to: localhost
+  run_once: true
+
+- name: Setup authorized_keys file
+  authorized_key:
+    user: root
+    state: present
+    key: "{{ lookup('file', public_key) }}"
+  become: true
+  vars:
+    public_key: "{{ ssh_dir }}/{{ offline_ssh_key_file_name }}.pub"
diff --git a/ansible/setup.yml b/ansible/setup.yml
index ec572973..9e4f051d 100644
--- a/ansible/setup.yml
+++ b/ansible/setup.yml
@@ -1,26 +1,6 @@
 ---
-- hosts: localhost
+- name: Setup nodes for installer
+  hosts: all
   gather_facts: false
-  tasks:
-    - name: "Check and generate key if needed"
-      block:
-        - stat:
-            path: '{{ private_key }}.pub'
-          register: p
-
-        - command: ssh-keygen -f {{ private_key }} -t rsa -N ''
-          when: not p.stat.exists
-  vars:
-    private_key: /root/.ssh/offline_ssh_key
-
-- hosts: all
-  gather_facts: false
-  tasks:
-  - name: Setup authorized_keys file
-    authorized_key:
-      user: root
-      state: present
-      key: "{{ lookup('file', public_key) }}"
-    become: true
-  vars:
-    public_key: /root/.ssh/offline_ssh_key.pub
+  roles:
+    - setup