summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2018-02-10 18:22:46 +0200
committerLars Wirzenius <liw@liw.fi>2018-02-10 18:25:30 +0200
commit56e43239aeb7d38d27b81423fcb506706f394a26 (patch)
tree297895c3014d62fdd0724473c97f253d9c63a1d0
parentd385577ac0cbcbfc78e59cd68c4bd9ab55627392 (diff)
downloadick2-ansible-56e43239aeb7d38d27b81423fcb506706f394a26.tar.gz
Change: allow multiple workers to be installed
Building one by one works, concurrently probably not.
-rw-r--r--hosts11
-rw-r--r--ick-cluster.yml3
-rw-r--r--roles/ick-worker/templates/worker_manager.yaml.j22
-rwxr-xr-xrun-cluster.sh4
4 files changed, 12 insertions, 8 deletions
diff --git a/hosts b/hosts
index ac636ca..e60fbe4 100644
--- a/hosts
+++ b/hosts
@@ -1,4 +1,9 @@
[ick]
-worker ansible_ssh_host=165.227.154.4
-blob_service ansible_ssh_host=207.154.253.196
-controller ansible_ssh_host=138.197.182.60
+blob_service ansible_ssh_host=207.154.244.235
+controller ansible_ssh_host=207.154.212.62
+worker1 hostname=worker1 ansible_ssh_host=207.154.247.23
+worker2 hostname=worker2 ansible_ssh_host=46.101.247.167
+
+[workers]
+worker1
+worker2
diff --git a/ick-cluster.yml b/ick-cluster.yml
index 0a8e668..581a338 100644
--- a/ick-cluster.yml
+++ b/ick-cluster.yml
@@ -1,4 +1,4 @@
-- hosts: worker
+- hosts: workers
remote_user: ansible
become: yes
roles:
@@ -7,7 +7,6 @@
- unix_users
- ick-worker
vars:
- hostname: worker
wm_ssh_key: "{{ lookup('pipe', 'pass show ick2/wm_ssh_key') }}"
wm_ssh_key_pub: "{{ lookup('pipe', 'pass show ick2/wm_ssh_key_pub') }}"
unix_users:
diff --git a/roles/ick-worker/templates/worker_manager.yaml.j2 b/roles/ick-worker/templates/worker_manager.yaml.j2
index d742a42..b832de3 100644
--- a/roles/ick-worker/templates/worker_manager.yaml.j2
+++ b/roles/ick-worker/templates/worker_manager.yaml.j2
@@ -1,6 +1,6 @@
config:
controller: "{{ controller_url }}"
- name: worker1
+ name: "{{ hostname }}"
log: /var/log/ickwm/worker_manager.log
log-level: debug
log-max: 10M
diff --git a/run-cluster.sh b/run-cluster.sh
index 713719b..273eae7 100755
--- a/run-cluster.sh
+++ b/run-cluster.sh
@@ -5,6 +5,6 @@ set -eu
./run-playbook \
ick-cluster.yml \
-e ansible_ssh_user=root \
- -e controller_domain=138.197.182.60 \
- -e blob_service_domain=207.154.253.196 \
+ -e controller_domain=207.154.212.62 \
+ -e blob_service_domain=207.154.244.235 \
"$@"