Merge branch 'howlermonkey' of https://github.com/DICE-UNC/DE into ho…

…wlermonkey

ansible/DockerfileConfigs

@@ -2,10 +2,11 @@ FROM tianon/true
 
 COPY config_files/iplant/de/logging/ /etc/iplant/de/logging/
 COPY config_files/nginx/ /etc/nginx/
-COPY config_files/iplant/de/*.properties /etc/iplant/de/
-COPY config_files/iplant/de/de-application.yaml /etc/iplant/de/
-COPY config_files/iplant/de/logstash-forwarder/ /etc/logstash-forwarder/
-COPY config_files/docker-gc/docker-gc-* /etc/docker-gc/
+
+COPY config_files/*.properties /etc/iplant/de/
+COPY config_files/*.yaml /etc/iplant/de/
+COPY config_files/logstash-forwarder/ /etc/logstash-forwarder/
+COPY config_files/docker-gc-* /etc/docker-gc/
 
 VOLUME /etc/iplant/de/logging/
 VOLUME /etc/iplant/de/

ansible/db-migrations.yaml

@@ -3,7 +3,7 @@
   hosts: db-proxy:&systems
   tags:
       - databases
-  sudo: False
+  become: False
 
   roles:
       - role: util-notify-chat

ansible/inventories/example.cfg

@@ -48,6 +48,7 @@ metadata
 monkey
 notificationagent
 saved-searches
+templeton-periodic
 terrain
 tree-urls
 user-preferences
@@ -110,6 +111,9 @@ services.example.com
 [saved-searches]
 services.example.com
 
+[templeton-periodic]
+services.example.com
+
 [terrain]
 services.example.com
 

ansible/inventories/group_vars/all

@@ -128,7 +128,7 @@ docker:
   log_driver: syslog
   tag: latest
   user: discoenv
-  version: 1.9.1
+  version: 1.10.2
   compose_path: /etc/docker-compose.yml
   registry:
     host: "{{ groups['docker-registry'][0] }}"
@@ -249,8 +249,8 @@ de:
 #          ssl_certificate: "/etc/ssl/example.com.crt"
 #          ssl_certificate_key: "/etc/ssl/example.com.key"
 
-app_version_name: Phthalo
-app_version: 2.4.0
+de_version_name: Phthalo
+de_version: 2.5.0
 
 de_feedback_to_addr: ""
 de_mail_from_addr: "{{ de_feedback_to_addr }}"
@@ -376,6 +376,7 @@ elasticsearch:
   base: "http://{{ groups['elasticsearch'][0] }}"
   scroll_size: 1000
   cluster_name: elasticsearch
+  data_index: data
   heap_size:
   network_http_port:
   network_transport_tcp_port:
@@ -509,6 +510,10 @@ irods:
   admins: rodsadmin
   data_curators_group: data-curators
   bad_chars: \u0060\u0027\u000A\u0009
+  amqp_broker:
+    host: "{{ groups['amqp-brokers'][0] }}"
+    port:
+
 
 # Jex does not actually have a container. The container name is how most syslog entries
 # are identified. See rsyslog-config role.
@@ -708,6 +713,16 @@ saved_searches:
 
 search_default_limit: 200
 
+templeton_periodic:
+  host: "{{ groups['templeton-periodic'][0] }}"
+  port:
+  service_name_short: templeton-periodic
+  compose_service: templeton_periodic
+  service_description: templeton periodic service
+  image_name: templeton
+  container_name: templeton-periodic
+  log_file: templeton-docker.log
+
 tree_parser_base: http://portnoy.iplantcollaborative.org/parseTree
 
 tree_urls_log_file: /logs/tree-urls.log

ansible/playbooks/de-jex.yaml

@@ -1,7 +1,7 @@
 ---
 - name: Configure JEX
   hosts: jex:&systems
-  sudo: yes
+  become: yes
   tags:
       - jex
   pre_tasks:

ansible/playbooks/de-porklock.yaml

@@ -1,7 +1,7 @@
 ---
 - name: Deploy porklock
   hosts: condor:&systems
-  sudo: True
+  become: True
   gather_facts: false
   tags:
       - porklock

ansible/playbooks/de-pull-images.yaml

@@ -1,7 +1,7 @@
 ---
 # - name: Update iplant-data
 #   hosts: docker-ready:&systems
-#   sudo: true
+#   become: true
 #   gather_facts: false
 #   tags:
 #     - services
@@ -12,8 +12,9 @@
 #       service_name_short: "{{data_container.service_name_short}}"
 
 - name: Update anon-files
-  hosts: anon-files
-  sudo: true
+
+  hosts: anon-files:&systems
+  become: true
   gather_facts: false
   tags:
     - services
@@ -29,7 +30,7 @@
 
 - name: Update apps
   hosts: apps:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -44,7 +45,7 @@
 
 - name: Update iplant-data-apps
   hosts: docker-ready:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -56,7 +57,7 @@
 
 - name: Update clockwork
   hosts: clockwork:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -71,7 +72,7 @@
 
 - name: Update clm
   hosts: condor-log-monitor:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -86,7 +87,7 @@
 
 - name: Update data-info
   hosts: data-info:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -101,7 +102,7 @@
 
 - name: Update dewey
   hosts: dewey:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -118,7 +119,7 @@
 
 - name: Update de-ui
   hosts: ui:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - ui
@@ -132,7 +133,7 @@
 
 - name: Update iplant-data-de-ui
   hosts: docker-ready:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -144,7 +145,7 @@
 
 - name: Update de-ui-nginx
   hosts: ui:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - ui
@@ -159,7 +160,7 @@
 
 - name: Update iplant-data-de-ui-nginx
   hosts: docker-ready:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -171,7 +172,7 @@
 
 - name: Update exim-sender
   hosts: exim-sender:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -183,7 +184,7 @@
 
 - name: Update info-typer
   hosts: info-typer:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -200,7 +201,7 @@
 
 - name: Update infosquito
   hosts: infosquito:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -217,7 +218,7 @@
 
 - name: Update iplant-email
   hosts: iplant-email:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -232,7 +233,7 @@
 
 - name: Update iplant-groups
   hosts: iplant-groups:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -247,7 +248,7 @@
 
 - name: Update jex-events
   hosts: jexevents:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -262,7 +263,7 @@
 
 - name: Update kifshare
   hosts: kifshare:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -277,7 +278,7 @@
 
 - name: Update metadata
   hosts: metadata:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -292,7 +293,7 @@
 
 - name: Update monkey
   hosts: monkey:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -309,7 +310,7 @@
 
 - name: Update notification-agent
   hosts: notificationagent:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -324,7 +325,7 @@
 
 - name: Update saved-searches
   hosts: saved-searches:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -337,9 +338,27 @@
       service_name: "{{saved_searches.compose_service}}"
       service_name_short: "{{saved_searches.service_name_short}}"
 
+- name: Update templeton-periodic
+  hosts: templeton-periodic:&systems
+  become: true
+  gather_facts: false
+  tags:
+    - services
+    - templeton
+    - templeton-periodic
+  roles:
+    - role: util-cfg-docker-pull-configs
+      when: not parasitic
+      service_name: "{{templeton_periodic.compose_service}}"
+      service_name_short: "{{templeton_periodic.service_name_short}}"
+    - role: util-cfg-docker-pull
+      when: not parasitic
+      service_name: "{{templeton_periodic.compose_service}}"
+      service_name_short: "{{templeton_periodic.service_name_short}}"
+
 - name: Update terrain
   hosts: terrain:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -354,7 +373,7 @@
 
 - name: Update iplant-data-terrain
   hosts: docker-ready:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -366,7 +385,7 @@
 
 - name: Update tree-urls
   hosts: tree-urls:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -381,7 +400,7 @@
 
 - name: Update user-preferences
   hosts: user-preferences:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services
@@ -396,7 +415,7 @@
 
 - name: Update user-sessions
   hosts: user-sessions:&systems
-  sudo: true
+  become: true
   gather_facts: false
   tags:
     - services