summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2021-03-15 12:10:39 +0200
committerLars Wirzenius <liw@liw.fi>2021-03-15 12:10:39 +0200
commitaec7f577a42bf2670899287ca9de092f9b9382ef (patch)
tree395235af73c27eb29f6f06368c9d44e6bb8b3e31
parent0fd7fc4e7d37a9007ab6f8182732aebec0fcb3db (diff)
downloadick2-ansible-aec7f577a42bf2670899287ca9de092f9b9382ef.tar.gz
qvisqve intalls
-rw-r--r--group_vars/ickhost.yml2
-rw-r--r--hosts21
-rw-r--r--ick-cluster.yml2
-rw-r--r--liw.yml2
-rw-r--r--roles/qvisqve/tasks/main.yml5
5 files changed, 27 insertions, 5 deletions
diff --git a/group_vars/ickhost.yml b/group_vars/ickhost.yml
index 094dfd5..67b4290 100644
--- a/group_vars/ickhost.yml
+++ b/group_vars/ickhost.yml
@@ -3,7 +3,7 @@ tls_certificate: FIXME
ci_prefix: ""
-sources_lists:
+sane_debian_system_sources_lists:
# - repo: "deb http://code.liw.fi/debian unstable main ickhost"
# signing_key: "{{ code_liw_fi_signing_key }}"
- repo: "deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main ickhost"
diff --git a/hosts b/hosts
new file mode 100644
index 0000000..137a755
--- /dev/null
+++ b/hosts
@@ -0,0 +1,21 @@
+ick
+worker1
+
+[ickhost]
+ick
+worker1
+
+[controller]
+ick
+
+[qvisqve]
+ick
+
+[apt]
+ick
+
+[notify]
+ick
+
+[workers]
+worker1
diff --git a/ick-cluster.yml b/ick-cluster.yml
index 06ea705..d097f75 100644
--- a/ick-cluster.yml
+++ b/ick-cluster.yml
@@ -6,7 +6,7 @@
- comfortable
- apt_repository
- haproxy-for-ick
- # - qvisqve
+ - qvisqve
# - ick-controller
# - ick-artifact-store
# - ick-notifier
diff --git a/liw.yml b/liw.yml
index e119ea9..b77f40a 100644
--- a/liw.yml
+++ b/liw.yml
@@ -53,6 +53,8 @@ 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_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') }}"
qvisqve_worker1_salt: "{{ lookup('pipe', 'pass show ick2/worker1_salt') }}"
qvisqve_worker2_hash: "{{ lookup('pipe', 'pass show ick2/worker1_hash') }}"
diff --git a/roles/qvisqve/tasks/main.yml b/roles/qvisqve/tasks/main.yml
index 21f20fb..0d14917 100644
--- a/roles/qvisqve/tasks/main.yml
+++ b/roles/qvisqve/tasks/main.yml
@@ -11,9 +11,8 @@
- name: "install Qvisqve"
apt:
- name: "{{ item }}"
- with_items:
- - qvisqve
+ name:
+ - qvisqve
- name: "create Qvisqve store dir"
file: