Change: update stuff for deploying working ick instances

1 files changed, 4 insertions, 66 deletions

diff --git a/ick2.yml b/ick2.yml
index 3b1bab8..b505687 100644
--- a/ick2.yml
+++ b/ick2.yml
@@ -1,4 +1,4 @@
-- hosts: single
+- hosts: ick
   remote_user: root
   become: yes
   roles:
@@ -9,75 +9,13 @@
     - haproxy
     - qvisqve
     - ick-controller
-    - ick-worker
     - ick-artifact-store
-    - ick-notifier
     - apt_repository
+    - ick-notifier
+    - ick-worker
   vars:
     hostname: ick
-    debian_codename: stretch
-    ci_prefix: ""
 
+    verify_tls: no
     letsencrypt: no
-    letsencrypt_email: liw@liw.fi
-    letsencrypt_domain: "{{ qvisqve_domain }}"
     tls_certificate: "{{ lookup('pipe', 'pass show ick2/ick.pem') }}"
-    verify_tls: no
-
-    token_private_key: "{{ lookup('pipe', 'pass show ick2/token_key') }}"
-    token_public_key: "{{ lookup('pipe', 'pass show ick2/token_key.pub') }}"
-
-    qvisqve_domain: 127.0.0.1
-    qvisqve_port: 10000
-    qvisqve_url: "https://{{ qvisqve_domain }}"
-
-    controller_domain: 127.0.0.1
-    controller_port: 12765
-    controller_url: "https://{{ controller_domain }}"
-
-    artifact_store_domain: 127.0.0.1
-    artifact_store_port: 12766
-    artifact_store_url: "https://{{ artifact_store_domain }}"
-
-    apt_domain: 127.0.0.1
-
-    notify_domain: 127.0.0.1
-    notify_url: "https://{{ notify_domain }}/notify"
-    notify_port: 12767
-
-    smtp_server: pieni.net
-    smtp_port: 587
-    smtp_user: pienirelay
-    smtp_password: "{{ lookup('pipe', 'pass show pieni.net/pienirelay') }}"
-
-    unix_users:
-      - username: _ickwm
-        sudo: yes
-        ssh_key: "{{ wm_ssh_key }}"
-        ssh_key_pub: "{{ wm_ssh_key_pub }}"
-
-    apt_uploader_ssh_public_keys:
-      - "{{ wm_ssh_key_pub }}"
-    apt_signing_key: "{{ lookup('pipe', 'pass show ick2/apt_key') }}"
-    apt_signing_key_pub: "{{ lookup('pipe', 'pass show ick2/apt_key.pub') }}"
-    apt_signing_key_fingerprint: |
-      {{ lookup('pipe', 'pass show ick2/apt_key.pub | gpg --with-colons | grep "^fpr:" | cut -d: -f10') }}
-    apt_admin_email: liw@liw.fi
-    apt_distributions:
-      - codename: stretch
-        description: Release packages for stretch
-      - codename: stretch-ci
-        description: CI builds for stretch
-      - codename: unstable
-        description: Release packages for unstable
-      - codename: unstable-ci
-        description: CI builds for unstable
-      - codename: liw-ci
-        description: CI builds for unstable from liw
-
-    sources_lists:
-      - repo: "deb http://code.liw.fi/debian stretch main"
-        keyring_package: code.liw.fi-keyring
-        signing_key: "{{ code_liw_fi_signing_key }}"
-      - repo: "deb http://ci-prod-apt.vm.liw.fi/debian liw-ci main"
-        signing_key: "{{ ci_prod_apt_signing_key }}"