From 965170ff21e71a59f0deddd67342ee8d155f8f39 Mon Sep 17 00:00:00 2001
From: Sebastian Haderecker <sebastian.haderecker@gmail.com>
Date: Thu, 16 May 2019 10:51:04 +0000
Subject: [PATCH] Moved to hpfeeds cmdline option

---
 .../ansible/roles/custom_ews/tasks/main.yaml  | 34 +++++--------------
 .../roles/custom_ews/templates/hpfeeds.cfg}   |  2 +-
 .../deploy_ansible_otc_t-pot.sh               | 13 -------
 3 files changed, 10 insertions(+), 39 deletions(-)
 rename cloud/open-telekom-cloud/{.hpfeeds_settings.sh => ansible/roles/custom_ews/templates/hpfeeds.cfg} (100%)

diff --git a/cloud/open-telekom-cloud/ansible/roles/custom_ews/tasks/main.yaml b/cloud/open-telekom-cloud/ansible/roles/custom_ews/tasks/main.yaml
index 06404182..151ea000 100644
--- a/cloud/open-telekom-cloud/ansible/roles/custom_ews/tasks/main.yaml
+++ b/cloud/open-telekom-cloud/ansible/roles/custom_ews/tasks/main.yaml
@@ -12,29 +12,13 @@
     insertafter: '/opt/ewsposter/ews.ip'
     line: '     - /data/ews/conf/ews.cfg:/opt/ewsposter/ews.cfg'
 
-- name: Lookup HPFEED environment variables
-  set_fact:
-    myENABLE: "{{ lookup('env', 'myENABLE') }}"
-    myHOST: "{{ lookup('env', 'myHOST') }}"
-    myPORT: "{{ lookup('env', 'myPORT') }}"
-    myCHANNEL: "{{ lookup('env', 'myCHANNEL') }}"
-    myIDENT: "{{ lookup('env', 'myIDENT') }}"
-    mySECRET: "{{ lookup('env', 'mySECRET') }}"
-    myCERT: "{{ lookup('env', 'myCERT') }}"
-    myFORMAT: "{{ lookup('env', 'myFORMAT') }}"
+- name: Copy hpfeeds configuration file
+  template:
+    src: ../templates/hpfeeds.cfg
+    dest: /data/ews/conf
+    owner: root
+    group: root
+    mode: 0644
 
-- name: Apply HPFEED settings in tpot.yml
-  lineinfile:
-    path: /opt/tpot/etc/tpot.yml
-    regexp: "{{ item.regexp }}"
-    line: "{{ item.line }}"
-  with_items:
-    - { regexp: 'EWS_HPFEEDS_ENABLE.*', line: '     - EWS_HPFEEDS_ENABLE={{ myENABLE | lower }}' }
-    - { regexp: 'EWS_HPFEEDS_HOST.*', line: '     - EWS_HPFEEDS_HOST={{ myHOST }}' }
-    - { regexp: 'EWS_HPFEEDS_PORT.*', line: '     - EWS_HPFEEDS_PORT={{ myPORT }}' }
-    - { regexp: 'EWS_HPFEEDS_CHANNELS.*', line: '     - EWS_HPFEEDS_CHANNELS={{ myCHANNEL }}' }
-    - { regexp: 'EWS_HPFEEDS_IDENT.*', line: '     - EWS_HPFEEDS_IDENT={{ myIDENT }}' }
-    - { regexp: 'EWS_HPFEEDS_SECRET.*', line: '     - EWS_HPFEEDS_SECRET={{ mySECRET }}' }
-    - { regexp: 'EWS_HPFEEDS_TLSCERT.*', line: '     - EWS_HPFEEDS_TLSCERT={{ myCERT }}' }
-    - { regexp: 'EWS_HPFEEDS_TLSCERT.False', line: '     - EWS_HPFEEDS_TLSCERT={{ myCERT | lower }}' }
-    - { regexp: 'EWS_HPFEEDS_FORMAT.*', line: '     - EWS_HPFEEDS_FORMAT={{ myFORMAT }}' }
+-name: Applying hpfeeds settings
+  command: /opt/tpot/bin/hpfeeds_optin.sh --conf=/data/ews/conf/hpfeeds.cfg
diff --git a/cloud/open-telekom-cloud/.hpfeeds_settings.sh b/cloud/open-telekom-cloud/ansible/roles/custom_ews/templates/hpfeeds.cfg
similarity index 100%
rename from cloud/open-telekom-cloud/.hpfeeds_settings.sh
rename to cloud/open-telekom-cloud/ansible/roles/custom_ews/templates/hpfeeds.cfg
index aae1dcad..1b981fdd 100644
--- a/cloud/open-telekom-cloud/.hpfeeds_settings.sh
+++ b/cloud/open-telekom-cloud/ansible/roles/custom_ews/templates/hpfeeds.cfg
@@ -2,7 +2,7 @@ myENABLE=false
 myHOST=host
 myPORT=port
 myCHANNEL=channels
+myCERT=false
 myIDENT=user
 mySECRET=secret
-myCERT=false
 myFORMAT=json
diff --git a/cloud/open-telekom-cloud/deploy_ansible_otc_t-pot.sh b/cloud/open-telekom-cloud/deploy_ansible_otc_t-pot.sh
index 072ce0e1..9f3756f9 100755
--- a/cloud/open-telekom-cloud/deploy_ansible_otc_t-pot.sh
+++ b/cloud/open-telekom-cloud/deploy_ansible_otc_t-pot.sh
@@ -33,22 +33,9 @@ source .ecs_settings.sh
 # Import OTC authentication credentials
 source .otc_env.sh
 
-# Import HPFEED settings
-source .hpfeeds_settings.sh
-
 # Password is later used by Ansible
 export LINUX_PASS=$linuxpass
 
-# HPFEED settings are later used by Ansible
-export myENABLE=$myENABLE
-export myHOST=$myHOST
-export myPORT=$myPORT
-export myCHANNEL=$myCHANNEL
-export myIDENT=$myIDENT
-export mySECRET=$mySECRET
-export myCERT=$myCERT
-export myFORMAT=$myFORMAT
-
 # Ignore ssh host keys as they are new anyway
 export ANSIBLE_HOST_KEY_CHECKING=False