Merge pull request #2850 from edx/bbeggs/go-server

removed supervisor role from go-server

playbooks/go-server.yml

@@ -6,5 +6,4 @@
   gather_facts: True
   roles:
   - aws
-  - supervisor
   - go-server

playbooks/roles/go-server/defaults/main.yml

@@ -14,10 +14,9 @@ GO_SERVER_SERVICE_NAME: "go-server"
 GO_SERVER_USER: "go"
 GO_SERVER_GROUP: "{{ GO_SERVER_USER }}"
 GO_SERVER_VERSION: "16.1.0-2855"
-GO_SERVER_HOME: "/var/lib/go-server/"
+GO_SERVER_HOME: "/var/lib/go-server"
 GO_SERVER_CONF_HOME: "/etc/go/"
 
-
 # Java version settings
 GO_SERVER_ORACLEJDK_VERSION: "7u51"
 GO_SERVER_ORACLEJDK_BASE: "jdk1.7.0_51"

playbooks/roles/go-server/tasks/main.yml

@@ -43,7 +43,15 @@
     name: "{{ GO_SERVER_APT_NAME }}={{ GO_SERVER_VERSION }}"
     update_cache: yes
 
-- name: install go-server-oauth-login
+- name: create go-server plugin directory
+  file:
+    path: "{{ GO_SERVER_OAUTH_LOGIN_JAR_DESTINATION }}"
+    state: directory
+    mode: 0776
+    owner: "{{ GO_SERVER_USER }}"
+    group: "{{ GO_SERVER_GROUP }}"
+
+- name: install go-server oauth plugin
   get_url:
     url: "{{ GO_SERVER_OAUTH_LOGIN_JAR_URL }}"
     dest: "{{ GO_SERVER_OAUTH_LOGIN_JAR_DESTINATION }}"
@@ -68,14 +76,6 @@
     owner: "{{ GO_SERVER_USER }}"
     group: "{{ GO_SERVER_GROUP }}"
 
-- name: copy go-server cruise database
-  copy:
-    src: cruise.h2.db
-    dest: "{{ GO_SERVER_CRUISE_CONTROL_DB_DESTIONATION }}"
-    mode: 0660
-    owner: "{{ GO_SERVER_USER }}"
-    group: "{{ GO_SERVER_GROUP }}"
-
 - name: restart go-server
   service:
     name: "{{ GO_SERVER_SERVICE_NAME }}"