Updates

- Move bootstrap into server config
- Remove bootstrap node role
- Use node role in startup scripts
- Update startup scripts
- Update install playbook

Author: brianshumate

CHANGELOG.md

@@ -195,3 +195,11 @@
 ## v1.6.0
 
 - Fix install task issue
+
+## v1.6.1
+
+- Move bootstrap into server config
+- Remove bootstrap node role
+- Use node role in startup scripts
+- Update startup scripts
+- Update install playbook

examples/vagrant_hosts

@@ -6,6 +6,6 @@
 #     Do not modify the labels (text appearing between []), however
 
 [nomad_cluster_nodes]
-nomad1.local nomad_node_role=bootstrap ansible_ssh_user=vagrant ansible_ssh_private_key_file=./.vagrant/machines/nomad1/virtualbox/private_key
+nomad1.local nomad_node_role=server ansible_ssh_user=vagrant ansible_ssh_private_key_file=./.vagrant/machines/nomad1/virtualbox/private_key
 nomad2.local nomad_node_role=server ansible_ssh_user=vagrant ansible_ssh_private_key_file=./.vagrant/machines/nomad2/virtualbox/private_key
 nomad3.local nomad_node_role=client ansible_ssh_user=vagrant ansible_ssh_private_key_file=./.vagrant/machines/nomad3/virtualbox/private_key

tasks/install.yml

@@ -50,7 +50,7 @@
 - name: Install Nomad
   copy:
     src: "{{ role_path }}/files/nomad"
-    dest: /usr/local/bin/
+    dest: "{{ nomad_bin_dir }}"
     owner: "{{ nomad_user }}"
     group: "{{ nomad_group }}"
     mode: 0755

templates/bootstrap.hcl.j2

@@ -18,7 +18,7 @@ DESC="Nomad service discovery framework"
 NAME="nomad"
 DAEMON="{{ nomad_bin_dir }}/${NAME}"
 PIDFILE="{{ nomad_run_dir }}/${NAME}.pid"
-DAEMON_ARGS="agent -server -config {{ nomad_config_dir }}/base.hcl -config {{ nomad_config_dir }}/{{ nomad_node_role }}.hcl >> {{ nomad_log_dir }}/$NAME.log 2>&1"
+DAEMON_ARGS="agent -{{ nomad_node_role }} -config {{ nomad_config_dir }}/base.hcl -config {{ nomad_config_dir }}/{{ nomad_node_role }}.hcl >> {{ nomad_log_dir }}/$NAME.log 2>&1"
 USER="{{ nomad_user }}"
 SCRIPTNAME="/etc/init.d/${NAME}"
 

templates/nomad_debian.init.j2

@@ -16,15 +16,9 @@ After=basic.target network.target
 [Service]
 User={{ nomad_user }}
 Group={{ nomad_group }}
-{% if nomad_node_role == "server" %}
-ExecStart={{ nomad_bin_dir }}/nomad agent -server \
+ExecStart={{ nomad_bin_dir }}/nomad agent -{{ nomad_node_role }} \
     -config={{ nomad_config_dir }}/base.hcl \
     -config={{ nomad_config_dir }}/{{ nomad_node_role }}.hcl
-{% else %}
-ExecStart={{ nomad_bin_dir }}/nomad agent \
-    -config={{ nomad_config_dir }}/base.hcl \
-    -config={{ nomad_config_dir }}/{{ nomad_node_role }}.hcl
-{% endif %}
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure

templates/nomad_systemd.service.j2

@@ -41,7 +41,7 @@ start() {
   [ -f "$PID_FILE" ] && rm "$PID_FILE"
   daemon --user="{{ nomad_user }}" \
       --pidfile="$PID_FILE" \
-      "$nomad" agent -server -pid-file "${PID_FILE}" -config "${CONFIG_PATH}"/base.hcl -config "${CONFIG_PATH}/{{ nomad_node_role }}.hcl" "${LOG_FILE}" &
+      "$nomad" agent -"{{ nomad_node_role }}" -config "${CONFIG_PATH}"/base.hcl -config "${CONFIG_PATH}/{{ nomad_node_role }}.hcl" "${LOG_FILE}" &
   retcode=$?
   touch "{{ nomad_lockfile }}"
   return $retcode

templates/nomad_sysvinit.j2

@@ -6,6 +6,7 @@
 # Enable the server
 server {
     enabled = true
+    bootstrap_expect = {{ nomad_server_count }}
 {% if nomad_use_consul == False %}
     start_join= {{ lbracket }}{% for host in groups['cluster_nodes'] %}{% if hostvars[inventory_hostname]['ansible_default_ipv4']['address'] != hostvars[host]['ansible_default_ipv4']['address']  %}{{ comma() }}{{ quote }}{{ hostvars[host]['ansible_default_ipv4']['address'] }}{{ quote }}{% endif %}
 {% endfor %}{{ rbracket }}