Merge pull request #5 from agalitsyn/master

Do not hardcode keyserver and key

Author: AlexeySetevoi

tasks/install_apt.yml

@@ -1,10 +1,10 @@
 #Main installation actions
 #https://clickhouse.yandex/docs/en/getting_started/index.html#installation
 
-- name: Install by APT | Apt-key add yandex repo key
+- name: Install by APT | Apt-key add repo key
   apt_key:
-    keyserver: keyserver.ubuntu.com
-    id: E0C56BD4
+    keyserver: "{{ clickhouse_repo_keyserver }}"
+    id: "{{ clickhouse_repo_key }}"
   become: true
 
 - name: Install by APT | Repo installation

tasks/remove_apt.yml

@@ -15,10 +15,10 @@
     state: absent
   become: true
 
-- name: Uninstall by APT | Apt-key remove yandex repo key
+- name: Uninstall by APT | Apt-key remove repo key
   apt_key:
-    keyserver: keyserver.ubuntu.com
-    id: E0C56BD4
+    keyserver: "{{ clickhouse_repo_keyserver }}"
+    id: "{{ clickhouse_repo_key }}"
     state: absent
   become: true
 

vars/Ubuntu_precise.yml

@@ -1,4 +1,6 @@
 clickhouse_supported: yes
+clickhouse_repo_keyserver: keyserver.ubuntu.com
+clickhouse_repo_key: E0C56BD4
 clickhouse_repo: "deb http://repo.yandex.ru/clickhouse/precise stable main"
 clickhouse_package:
   - clickhouse-client

vars/Ubuntu_trusty.yml

@@ -1,4 +1,6 @@
 clickhouse_supported: yes
+clickhouse_repo_keyserver: keyserver.ubuntu.com
+clickhouse_repo_key: E0C56BD4
 clickhouse_repo: "deb http://repo.yandex.ru/clickhouse/trusty stable main"
 clickhouse_package:
   - clickhouse-client

vars/Ubuntu_xenial.yml

@@ -1,4 +1,6 @@
 clickhouse_supported: yes
+clickhouse_repo_keyserver: keyserver.ubuntu.com
+clickhouse_repo_key: E0C56BD4
 clickhouse_repo: "deb http://repo.yandex.ru/clickhouse/xenial stable main"
 clickhouse_package:
   - clickhouse-client