Skip to content

Commit 722018a

Browse files
committed
v1.8.7
1 parent 6e0ffe2 commit 722018a

File tree

9 files changed

+17
-24
lines changed

9 files changed

+17
-24
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## v1.8.7
2+
3+
- Nomad v0.9.2
4+
- Use SELinux module in tasks/selinux
5+
- Remove invalid nomad_log_dir configuration (#39)
6+
- Update documentation
7+
18
## v1.8.6
29

310
- Correct args for install task

README.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This role requires an Arch Linux, Debian, RHEL, or Ubuntu distribution; the role
1818
with the following specific software versions:
1919

2020
* Ansible: 2.7.10
21-
* nomad: 0.9.1
21+
* nomad: 0.9.2
2222
* Arch Linux
2323
* CentOS: 7
2424
* Debian: 8
@@ -36,7 +36,7 @@ The role defines most of its variables in `defaults/main.yml`:
3636
### `nomad_version`
3737

3838
- Nomad version to install
39-
- Default value: **0.9.1**
39+
- Default value: **0.9.2**
4040

4141
### `nomad_architecture_map`
4242

@@ -84,11 +84,6 @@ The role defines most of its variables in `defaults/main.yml`:
8484
- Nomad lockfile path
8585
- Default value: `/var/lock/subsys/nomad`
8686

87-
### `nomad_log_dir`
88-
89-
- Nomad log path
90-
- Default value: `/var/log/nomad`
91-
9287
### `nomad_run_dir`
9388

9489
- Nomad run path

defaults/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
nomad_debug: false
66

77
### Package
8-
nomad_version: "{{ lookup('env','NOMAD_VERSION') | default('0.9.1', true) }}"
8+
nomad_version: "{{ lookup('env','NOMAD_VERSION') | default('0.9.2', true) }}"
99
nomad_architecture_map:
1010
amd64: amd64
1111
x86_64: amd64
@@ -23,7 +23,6 @@ nomad_bin_dir: "/usr/local/bin"
2323
nomad_config_dir: "/etc/nomad.d"
2424
nomad_data_dir: "/var/nomad"
2525
nomad_lockfile: "/var/lock/subsys/nomad"
26-
nomad_log_dir: "/var/log/nomad"
2726
nomad_run_dir: "/var/run/nomad"
2827

2928
### System user and group

examples/README_VAGRANT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ BOX_NAME="centos/7" vagrant up
8383
## Notes
8484

8585
1. This project functions with the following software versions:
86-
* Nomad version 0.9.1
86+
* Nomad version 0.9.2
8787
* Ansible version 2.8.0
8888
* VirtualBox version 5.2.30
8989
* Vagrant version 2.2.4

tasks/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
group: "{{ nomad_group }}"
4747
with_items:
4848
- "{{ nomad_data_dir }}"
49-
- "{{ nomad_log_dir }}"
5049

5150
- name: Create config directory
5251
file:

tasks/selinux.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33

44
# SELinux disrupts LXC (shrug)
55

6-
- name: Stop SELinux enforcing
7-
shell: "setenforce 0"
8-
when: nomad_docker_enable == "true"
9-
10-
- name: Disable SELinux
11-
replace:
12-
dest: /etc/selinux/config
13-
regexp: '^SELINUX=enforcing'
14-
replace: 'SELINUX=disabled'
6+
- name: Disable SELinux for Docker Driver
7+
selinux:
8+
state: disabled
159
when: nomad_docker_enable == "true"

templates/nomad_debian.init.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ DESC="Nomad, a distributed, highly available, datacenter-aware scheduler"
1818
NAME="nomad"
1919
DAEMON="{{ nomad_bin_dir }}/${NAME}"
2020
PIDFILE="{{ nomad_run_dir }}/${NAME}.pid"
21-
DAEMON_ARGS="agent -config {{ nomad_config_dir }} >> {{ nomad_log_dir }}/$NAME.log 2>&1"
21+
DAEMON_ARGS="agent -config {{ nomad_config_dir }}2>&1"
2222
USER="{{ nomad_user }}"
2323
SCRIPTNAME="/etc/init.d/${NAME}"
2424

templates/nomad_sysvinit.j2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
nomad="{{nomad_bin_dir}}/nomad"
1313
CONFIG_PATH="{{ nomad_config_dir }}"
1414
PID_FILE="{{ nomad_run_dir }}/nomad.pid"
15-
LOG_FILE="{{ nomad_log_dir }}/nomad.log"
1615

1716
[ -e /etc/sysconfig/nomad ] && . /etc/sysconfig/nomad
1817

@@ -41,7 +40,7 @@ start() {
4140
[ -f "$PID_FILE" ] && rm "$PID_FILE"
4241
daemon --user="{{ nomad_user }}" \
4342
--pidfile="$PID_FILE" \
44-
"$nomad" agent -config "${CONFIG_PATH}" &>> "${LOG_FILE}" \&
43+
"$nomad" agent -config "${CONFIG_PATH}" \&
4544
retcode=$?
4645
touch "{{ nomad_lockfile }}"
4746
return $retcode

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.8.6
1+
v1.8.7

0 commit comments

Comments
 (0)