summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2021-03-15 13:21:25 +0200
committerLars Wirzenius <liw@liw.fi>2021-03-15 13:21:25 +0200
commit141fb4eee39f15f818ca331ecee2fca58183e5a1 (patch)
treef4e3fde4981b6efd6e87301ee44f769f07ba6563
parent144844a35f3a33a2e16d0a99daae4521235455ed (diff)
downloadick2-ansible-141fb4eee39f15f818ca331ecee2fca58183e5a1.tar.gz
controller secret
-rw-r--r--liw.yml1
-rw-r--r--roles/comfortable/tasks/main.yml1
-rw-r--r--roles/ick-controller/templates/controller.yaml.j23
3 files changed, 5 insertions, 0 deletions
diff --git a/liw.yml b/liw.yml
index b77f40a..097cb5e 100644
--- a/liw.yml
+++ b/liw.yml
@@ -53,6 +53,7 @@ qvisqve_token_public_key: "{{ lookup('pipe', 'pass show ick2/token_key.pub') }}"
qvisqve_token_private_key: "{{ lookup('pipe', 'pass show ick2/token_key') }}"
qvisqve_admin_hash: "{{ lookup('pipe', 'pass show ick2/liw_hash') }}"
qvisqve_admin_salt: "{{ lookup('pipe', 'pass show ick2/liw_salt') }}"
+qvisqve_controller_secret: "{{ lookup('pipe', 'pass show ick2/controller_secret') }}"
qvisqve_controller_hash: "{{ lookup('pipe', 'pass show ick2/controller_hash') }}"
qvisqve_controller_salt: "{{ lookup('pipe', 'pass show ick2/controller_salt') }}"
qvisqve_worker1_hash: "{{ lookup('pipe', 'pass show ick2/worker1_hash') }}"
diff --git a/roles/comfortable/tasks/main.yml b/roles/comfortable/tasks/main.yml
index c00f642..ebf3fa5 100644
--- a/roles/comfortable/tasks/main.yml
+++ b/roles/comfortable/tasks/main.yml
@@ -6,6 +6,7 @@
- curl
- psmisc
- locales-all
+ - jq
- name: "remove uncomfortable packages"
apt:
name: "{{ item }}"
diff --git a/roles/ick-controller/templates/controller.yaml.j2 b/roles/ick-controller/templates/controller.yaml.j2
index c54a47d..f8fded6 100644
--- a/roles/ick-controller/templates/controller.yaml.j2
+++ b/roles/ick-controller/templates/controller.yaml.j2
@@ -10,3 +10,6 @@ token-public-key: "{{ qvisqve_token_public_key }}"
log:
- filename: /var/log/ick/controller.log
statedir: /var/lib/ick/state
+muck-url: "http://localhost:{{ muck_port }}"
+client-id: controller
+client-secret: "{{ qvisqve_controller_secret }}"