ansible: fix invalid syntax and other errors in the kraken role

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/ansible/examples/kraken.yml b/ansible/examples/kraken.yml
index ca3c5f863b18dc2985a0b1042156d3c27164a144..eb527c793a5ccef40062b19ef427eb73dc3d4089 100644 (file)
--- a/ansible/examples/kraken.yml
+++ b/ansible/examples/kraken.yml
@@ -70,7 +70,7 @@
      rabbitmq_user: ""
      rabbitmq_password: ""
      rabbitmq_host: ""
-     rabbitmq_exchange:""
+     rabbitmq_exchange: ""
      rabbitmq_routing_keys: []
 
      # needed for helga-redmine

diff --git a/ansible/roles/kraken/handlers/main.yml b/ansible/roles/kraken/handlers/main.yml
index 775d990a8ceca07c01930f1f91172d2ebc84562d..47e28e857a01f0d590579bd41ee11ee2fd7ca830 100644 (file)
--- a/ansible/roles/kraken/handlers/main.yml
+++ b/ansible/roles/kraken/handlers/main.yml
@@ -4,3 +4,8 @@
   service:
     name: helga
     status: restarted
+
+# prevents issues when updating systemd files
+- name: reload systemd
+  sudo: yes
+  command: systemctl daemon-reload

diff --git a/ansible/roles/kraken/tasks/main.yml b/ansible/roles/kraken/tasks/main.yml
index c3354392044677b7ae77f9a5a0214ff840eaad67..9829b64fabe84253ce8f3dc2d7e0022969bc0ff7 100644 (file)
--- a/ansible/roles/kraken/tasks/main.yml
+++ b/ansible/roles/kraken/tasks/main.yml
@@ -3,16 +3,16 @@
 - name: Create a home for Helga.
   become: yes
   file:
-    path: {{ helga_home }}
-    owner: {{ ansible_ssh_user }} 
-    group: {{ ansible_ssh_user }}
+    path: "{{ helga_home }}"
+    owner: "{{ ansible_user }}"
+    group: "{{ ansible_user }}"
     state: directory
     recurse: yes
 
 - name: Install ssl requirements.
   become: yes
   yum:
-    name: {{ item }}
+    name: "{{ item }}"
     state: present
   with_items: helga_ssl_requirements
   when: helga_use_ssl
@@ -27,57 +27,57 @@
   become: yes
   yum:
     name: epel-release
-    state:present
+    state: present
 
 - name: Retrieve software requirements.
   become: yes
   yum:
-    name: {{ item }}
+    name: "{{ item }}"
     state: present
   with_items: "{{ helga_system_packages }}"
 
 - name: Create a virtualenv with latest pip.
   pip:
     name: pip
-    virtualenv: {{ helga_home }}
+    virtualenv: "{{ helga_home }}"
     extra_args: '--upgrade'
 
 - name: Install Helga.
   pip:
     name: helga
-    virtualenv: {{ helga_home }}
+    virtualenv: "{{ helga_home }}"
 
 - name: Install Helga unreleased enhancements.
   pip:
-    name: {{ item }}
+    name: "{{ item }}"
     state: present
     extra_args: "-e"
-    virtualenv: {{ helga_home }}
+    virtualenv: "{{ helga_home }}"
   with_items: "{{ helga_external_plugins }}"
   notify: restart helga service
 
 - name: Install Helga released enhancements.
   pip:
-    name: {{ item }}
+    name: "{{ item }}"
     state: latest
-    virtualenv: {{ helga_home }}
+    virtualenv: "{{ helga_home }}"
   with_items: "{{ helga_pypi_plugins }}"
   notify: restart helga service
 
 - name: Create settings directory
   file:
-    path: {{ helga_settings_path }}
-     state: directory
+    path: "{{ helga_settings_path }}"
+    state: directory
 
 - name: Install base personality.
   template:
     src: custom_settings.j2
-    dest: {{ helga_settings_path }}/00_base_settings.py
+    dest: "{{ helga_settings_path }}/00_base_settings.py"
 
 - name: Install personality customizations (files).
   copy:
-    src: {{ item }}
-    dest: {{ helga_settings_path }}
+    src: "{{ item }}"
+    dest: "{{ helga_settings_path }}"
 # this one is tricky, because the relative path is relative to
 # roles/common/files
   with_fileglob:
@@ -85,8 +85,8 @@
 
 - name: Custom settings, ASSEMBLE!
   assemble:
-    src: {{ helga_settings_path }}/
-    dest: {{ helga_home }}/bin/custom_settings.py
+    src: "{{ helga_settings_path }}/"
+    dest: "{{ helga_home }}/bin/custom_settings.py"
 
 - name: ensure mongod is running
   become: true

diff --git a/ansible/roles/kraken/templates/custom_settings.j2 b/ansible/roles/kraken/templates/custom_settings.j2
index eb1b05da5cc2641b6b85441094a55b175d100039..2ec2b8e02fc9f0e89bf5578e9aafae4b650618bc 100644 (file)
--- a/ansible/roles/kraken/templates/custom_settings.j2
+++ b/ansible/roles/kraken/templates/custom_settings.j2
@@ -33,11 +33,11 @@ COMMAND_PREFIX_CHAR = '{{ helga_cmd_prefix }}'
 WEBHOOKS_PORT = {{ helga_webhooks_port }}
 
 # Twitter API
-TWITTER_CONSUMER_KEY = {{ helga_twitter_api_key }}
-TWITTER_CONSUMER_SECRET = {{ helga_twitter_api_secret }}
-TWITTER_OAUTH_TOKEN = {{ helga_twitter_oauth_token }}
-TWITTER_OAUTH_TOKEN_SECRET = {{ helga_twitter_oauth_secret }}
-TWITTER_USERNAME = {{ helga_twitter_username }}
+TWITTER_CONSUMER_KEY = '{{ helga_twitter_api_key }}'
+TWITTER_CONSUMER_SECRET = '{{ helga_twitter_api_secret }}'
+TWITTER_OAUTH_TOKEN = '{{ helga_twitter_oauth_token }}'
+TWITTER_OAUTH_TOKEN_SECRET = '{{ helga_twitter_oauth_secret }}'
+TWITTER_USERNAME = '{{ helga_twitter_username }}'
 
 BUGZILLA_XMLRPC_URL = "{{ bugzilla_xmlrpc_url }}"
 BUGZILLA_TICKET_URL = "{{ bugzilla_ticket_url }}"
@@ -63,7 +63,7 @@ JENKINS_URL = '{{ jenkins_url }}'
 
 JENKINS_CREDENTIALS = {
     {% for key, value in jenkins_credentials.iteritems() %}
-    '{{ key }': {
+    '{{ key }}': {
         'username': '{{ value.username }}',
         'token': '{{ value.token }}',
     },

diff --git a/ansible/roles/kraken/templates/helga.service.j2 b/ansible/roles/kraken/templates/helga.service.j2
index edbbabd2724b12c8b7dd35c6edb33f66e78ff30e..afe6499ebbb70c98bcfbb7e6f13de909e28a07f5 100644 (file)
--- a/ansible/roles/kraken/templates/helga.service.j2
+++ b/ansible/roles/kraken/templates/helga.service.j2
@@ -4,10 +4,10 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart={{ app_home }}/bin/helga
+ExecStart={{ helga_home }}/bin/helga
 EnvironmentFile=/etc/sysconfig/helga
 User={{ ansible_ssh_user }}
-WorkingDirectory={{ app_home }}/src/
+WorkingDirectory={{ helga_home }}/src/
 StandardOutput=journal
 StandardError=journal