Code review comments

playbooks/edx-east/edxapp.yml

@@ -5,7 +5,6 @@
   vars:
   roles:
     - aws
-    - minos
     - role: nginx
       nginx_sites:
       - lms
@@ -21,3 +20,5 @@
       when: COMMON_ENABLE_SPLUNKFORWARDER
     - role: newrelic
       when: COMMON_ENABLE_NEWRELIC
+    - role: minos
+      when: COMMON_ENABLE_MINOS

playbooks/edx-east/worker.yml

@@ -4,7 +4,6 @@
   gather_facts: True
   roles:
     - aws
-    - minos
     - role: edxapp
       celery_worker: True
     - role: datadog
@@ -13,5 +12,6 @@
       when: COMMON_ENABLE_SPLUNKFORWARDER
     - role: newrelic
       when: COMMON_ENABLE_NEWRELIC
-
+    - role: minos
+      when: COMMON_ENABLE_MINOS
       
\ No newline at end of file

playbooks/roles/common/defaults/main.yml

@@ -56,6 +56,7 @@ COMMON_ENABLE_DATADOG: False
 COMMON_ENABLE_NGINXTRA: False
 COMMON_ENABLE_SPLUNKFORWARDER: False
 COMMON_ENABLE_NEWRELIC: False
+COMMON_ENABLE_MINOS: False
 COMMON_TAG_EC2_INSTANCE: False
 common_debian_pkgs:
   - ntp

playbooks/roles/minos/defaults/main.yml

@@ -11,7 +11,7 @@
 # Defaults for role minos
 # 
 MINOS_GIT_IDENTITY: !!null
-INSTALL_MINOS: false
+
 #
 # vars are namespace with the module name.
 #

playbooks/roles/minos/tasks/main.yml

@@ -12,13 +12,26 @@
 # Tasks for role minos
 # 
 # Overview:
-# 
+#
+# Install the, currently private, minos application
+# which determines whether or not it is safe to retire
+# a server
 #
 # Dependencies:
 #
+# Relies on the common role.
 # 
 # Example play:
 #
+# - name: Deploy minos
+#   hosts: all
+#   sudo: True
+#   gather_facts: True
+#   vars:
+#     COMMON_ENABLE_MINOS: True
+#   roles:
+#     - common
+#     - minos 
 #
 
 - name: gather ec2 facts
@@ -31,14 +44,12 @@
     owner=root
     group=root
     mode=0755
-  when: INSTALL_MINOS
 
 - name: create minos config
   template: >
     dest={{ minos_cfg_file }}
     src=edx/etc/minos/minos.yml.j2
     mode=0755 owner=root group=root
-  when: INSTALL_MINOS
   
 - name: create minos voters configs
   template: >
@@ -50,7 +61,6 @@
     - "ProccessQuienscenceVoterCelery"
     - "ProccessQuienscenceVoterGunicorn"
     - "TrackingLogVoter"
-  when: INSTALL_MINOS
 
     # Optional auth for git
 - name: create ssh script for git (not authenticated)
@@ -58,7 +68,6 @@
     src=tmp/git-identity.sh.j2 dest={{ minos_git_ssh }}
     mode=750
   when:
-    - INSTALL_MINOS
     - MINOS_GIT_IDENTITY is not defined
 
 - name: create ssh script for git (authenticated)
@@ -66,14 +75,12 @@
     src=tmp/git-identity.sh.j2 dest={{ minos_git_ssh }}
     mode=750
   when:
-    - INSTALL_MINOS
     - MINOS_GIT_IDENTITY is defined
 
 - name: install read-only ssh key
   copy: >
     content="{{ COMMON_GIT_IDENTITY }}" dest="{{ minos_git_identity }}"
     force=yes mode=0600
-  when: INSTALL_MINOS
 
 - name : install python custom-requirements
   pip: >
@@ -85,4 +92,3 @@
     GIT_SSH: "{{ minos_git_ssh }}"
   with_items:
     - "{{ minos_requirement }}"
-  when: INSTALL_MINOS
\ No newline at end of file