Merge pull request #2949 from edx/bbeggs/te-1268

the go-server FQDN is now a variable passed to the playbook.

playbooks/go-server.yml

-# ansible-playbook -i 'admin.edx.org,' ./hotg.yml -e@/path/to/ansible/vars/edx.yml -e@/path/to/secure/ansible/vars/edx_admin.yml
+# This playbook installs go-server
+# https://www.go.cd/
+#
 
 - name: Install go-server
   hosts: all

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

@@ -44,6 +44,11 @@ GO_SERVER_ADMIN_PASSWORD: ""
 GO_SERVER_BACKUP_USERNAME: ""
 GO_SERVER_BACKUP_PASSWORD: ""
 
+# go-server network settings
+GO_SERVER_PORT: 8153
+GO_SERVER_SECURE_PORT: 8154
+GO_SERVER_FQDN: go-server.sandbox.edx.org
+
 # H2 db settings
 GO_SERVER_H2DB_PATH: "db/h2db"
 GO_SERVER_H2DB_NAME: "cruise.h2.db"

playbooks/roles/go-server/templates/edx/app/go-server/cruise-config.xml.j2

 <cruise xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="cruise-config.xsd" schemaVersion="77">
-  <server artifactsdir="artifacts" siteUrl="http://{{ ansible_fqdn }}:8153" secureSiteUrl="https://{{ ansible_fqdn }}:8154" commandRepositoryLocation="default" serverId="d3a0287d-7698-4afe-a687-c165e8295918" agentAutoRegisterKey="{{ GO_SERVER_AUTO_REGISTER_KEY }}">
+  <server artifactsdir="artifacts" siteUrl="http://{{ GO_SERVER_FQDN }}:{{ GO_SERVER_PORT }}" secureSiteUrl="https://{{ GO_SERVER_FQDN }}:{{ GO_SERVER_SECURE_PORT }}" commandRepositoryLocation="default" serverId="d3a0287d-7698-4afe-a687-c165e8295918" agentAutoRegisterKey="{{ GO_SERVER_AUTO_REGISTER_KEY }}">
     <security>
       <passwordFile path="{{ GO_SERVER_CONF_HOME }}/{{ GO_SERVER_PASSWORD_FILE_NAME }}" />
       <admins>