From 71cd6fff20d5d2c46fcb1c536b90985b0e5014af Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 5 Sep 2017 20:08:39 +0200
Subject: [PATCH] Consolidate installation playbook
Hostnames are now set in host_vars and the same playbook is used for
all hosts. If one host needs to be reinstalled the playbook can be run
with "--limit $hostname".
Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
host_vars/apollo.archlinux.org | 2 ++
host_vars/orion.archlinux.org | 1 +
host_vars/soyuz.archlinux.org | 2 +-
host_vars/vostok.archlinux.org | 1 +
playbooks/apollo-provision.yml | 12 ------------
playbooks/{orion-provision.yml => install_arch.yml} | 6 ++----
playbooks/soyuz-provision.yml | 12 ------------
playbooks/vostok-provision.yml | 12 ------------
8 files changed, 7 insertions(+), 41 deletions(-)
delete mode 100644 playbooks/apollo-provision.yml
rename playbooks/{orion-provision.yml => install_arch.yml} (68%)
delete mode 100644 playbooks/soyuz-provision.yml
delete mode 100644 playbooks/vostok-provision.yml
diff --git a/host_vars/apollo.archlinux.org b/host_vars/apollo.archlinux.org
index 7f194f928..e25f63df7 100644
--- a/host_vars/apollo.archlinux.org
+++ b/host_vars/apollo.archlinux.org
@@ -1,5 +1,7 @@
---
+hostname: "apollo"
+
ipv4_address: "138.201.81.199"
ipv4_netmask: "/32"
ipv6_address: "2a01:4f8:172:1d86::1"
diff --git a/host_vars/orion.archlinux.org b/host_vars/orion.archlinux.org
index e7f17194d..cdc4fa9af 100644
--- a/host_vars/orion.archlinux.org
+++ b/host_vars/orion.archlinux.org
@@ -1,4 +1,5 @@
---
+hostname: "orion"
ipv4_address: "88.198.91.70"
ipv4_netmask: "/32"
ipv6_address: "2a01:4f8:160:6087::1"
diff --git a/host_vars/soyuz.archlinux.org b/host_vars/soyuz.archlinux.org
index 296072d94..b91ca70cc 100644
--- a/host_vars/soyuz.archlinux.org
+++ b/host_vars/soyuz.archlinux.org
@@ -1,5 +1,5 @@
-
---
+hostname: "soyuz"
ipv4_address: "138.201.206.85"
ipv4_netmask: "/32"
ipv6_address: "2a01:4f8:173:1654::1"
diff --git a/host_vars/vostok.archlinux.org b/host_vars/vostok.archlinux.org
index 757080bd6..c6efb8410 100644
--- a/host_vars/vostok.archlinux.org
+++ b/host_vars/vostok.archlinux.org
@@ -1,4 +1,5 @@
---
+hostname: "vostok"
ipv4_address: "5.9.158.171"
ipv4_netmask: "/32"
diff --git a/playbooks/apollo-provision.yml b/playbooks/apollo-provision.yml
deleted file mode 100644
index cb0a303a0..000000000
--- a/playbooks/apollo-provision.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-# This script is for provisioning a server for first boot.
-# Care: It is not idempotent by design.
-
-- name: provision apollo
- hosts: apollo
- remote_user: root
- vars:
- - hostname: apollo
- roles:
- - install_arch
diff --git a/playbooks/orion-provision.yml b/playbooks/install_arch.yml
similarity index 68%
rename from playbooks/orion-provision.yml
rename to playbooks/install_arch.yml
index 9137d823c..154d31d5f 100644
--- a/playbooks/orion-provision.yml
+++ b/playbooks/install_arch.yml
@@ -3,10 +3,8 @@
# This script is for provisioning a server for first boot.
# Care: It is not idempotent by design.
-- name: provision orion
- hosts: orion
+- name: install_arch
+ hosts: all
remote_user: root
- vars:
- - hostname: orion
roles:
- install_arch
diff --git a/playbooks/soyuz-provision.yml b/playbooks/soyuz-provision.yml
deleted file mode 100644
index 40d7b412e..000000000
--- a/playbooks/soyuz-provision.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-# This script is for provisioning a server for first boot.
-# Care: It is not idempotent by design.
-
-- name: provision soyuz
- hosts: soyuz
- remote_user: root
- vars:
- - hostname: soyuz
- roles:
- - install_arch
diff --git a/playbooks/vostok-provision.yml b/playbooks/vostok-provision.yml
deleted file mode 100644
index c2246c201..000000000
--- a/playbooks/vostok-provision.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-# This script is for provisioning a server for first boot.
-# Care: It is not idempotent by design.
-
-- name: provision vostok
- hosts: vostok
- remote_user: root
- vars:
- - hostname: vostok
- roles:
- - install_arch
--
GitLab