Add develop servers #24

Signed-off-by: 市川ゆり子/IchikawaYuriko <[email protected]>
IchikawaYukko · Sep 4, 2020 · 8d21692 · 8d21692
1 parent e2691d7
commit 8d21692
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 16 deletions.
diff --git a/common.yml b/common.yml
@@ -0,0 +1,18 @@
+---
+- hosts: all
+  become: yes
+  gather_facts: yes
+
+  roles:
+  - hostname
+  - dns-record
+  - admin-tools
+  - auditd
+  - basic-services
+  - docker
+  - forward-root-mail
+  - mosh
+  - selinux
+  - sudo
+  - users
+  - yum-cron
diff --git a/host_vars/nijntje.yml b/host_vars/nijntje.yml
@@ -0,0 +1 @@
+server_hostname: nijntje.tyo.yuriko.co.nz
diff --git a/host_vars/trijn.yml b/host_vars/trijn.yml
@@ -0,0 +1 @@
+server_hostname: trijn.tyo.yuriko.co.nz # from Tante Trijn in nijntje
diff --git a/hosts.yml b/hosts.yml
@@ -2,6 +2,9 @@ all:
   children:
     conoha:
       hosts:
-        trijn:
+        trijn: # Production
           ansible_host: trijn.tyo.yuriko.co.nz
           ansible_port: 7
+        nijntje: # Develop
+          ansible_host: nijntje.tyo.yuriko.co.nz
+          ansible_port: 7
diff --git a/roles/hostname/tasks/main.yml b/roles/hostname/tasks/main.yml
@@ -1,6 +1,5 @@
 ---
 - name: Set Hostname
   hostname:
-    # from Tante Trijn in nijntje
-    name: trijn.tyo.yuriko.co.nz
+    name: "{{ server_hostname }}"
     use: systemd
diff --git a/site.yml b/site.yml
@@ -1,2 +1,3 @@
 ---
+- import_playbook: common.yml
 - import_playbook: yuriko-servers.yml
diff --git a/yuriko-servers.yml b/yuriko-servers.yml
@@ -1,25 +1,13 @@
 ---
-- hosts: all
+- hosts: trijn
   become: yes
   gather_facts: yes
 
   roles:
-  - admin-tools
-  - auditd
   - backup
   - backup-pgsql
-  - basic-services
   - crontab
-  - dns-record
-  - docker
   - filesystem
   - firewall
   - firewall-bfv
-  - forward-root-mail
-  - hostname
-  - mosh
   - network
-  - selinux
-  - sudo
-  - users
-  - yum-cron