Skip to content

Commit 422c9a6

Browse files
committed
other Docker updates
1 parent 91964f0 commit 422c9a6

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,6 @@
8484
Vagrant provisioner when environment variable `NOMAD_DOCKER_ENABLE="true"`
8585
is set
8686
- Update start scripts to be smarter about node role
87+
- Add cgroups packages on Debian/Ubuntu
88+
- Run Nomad as root for now
89+

defaults/main.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ nomad_bin_dir: "/usr/local/bin"
99
nomad_config_dir: "/etc/nomad.d"
1010
nomad_data_dir: "/var/nomad"
1111
nomad_log_dir: "/var/log/nomad"
12-
nomad_user: "nomad"
12+
nomad_user: "root"
1313
nomad_group: "bin"
1414
nomad_region: "global"
1515
nomad_datacenter: "dc1"
@@ -40,8 +40,10 @@ nomad_debian_url: "{{ nomad_zip_url }}"
4040
nomad_debian_sha256: "{{ nomad_zip_sha256 }}"
4141
nomad_docker_debian_repo: "deb https://apt.dockerproject.org/repo debian-jessie main"
4242
nomad_debian_os_packages:
43+
- cgroup-bin
4344
- curl
4445
- git
46+
- libcgroup1
4547
- unzip
4648

4749
nomad_redhat_pkg: "nomad_{{ nomad_version }}_linux_amd64.zip"
@@ -59,6 +61,9 @@ nomad_ubuntu_url: "{{ nomad_zip_url }}"
5961
nomad_ubuntu_sha256: "{{ nomad_zip_sha256 }}"
6062
nomad_docker_ubuntu_repo: "deb https://apt.dockerproject.org/repo ubuntu-xenial main"
6163
nomad_ubuntu_os_packages:
62-
- git
64+
- cgroup-bin
6365
- curl
66+
- git
67+
- libcgroup1
6468
- unzip
69+

examples/vagrant_hosts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
[cluster_nodes]
99
nomad1.local nomad_node_role=bootstrap ansible_ssh_user=vagrant ansible_ssh_private_key_file=./.vagrant/machines/nomad1/virtualbox/private_key
1010
nomad2.local nomad_node_role=server ansible_ssh_user=vagrant ansible_ssh_private_key_file=./.vagrant/machines/nomad2/virtualbox/private_key
11-
nomad3.local nomad_node_role=server ansible_ssh_user=vagrant ansible_ssh_private_key_file=./.vagrant/machines/nomad3/virtualbox/private_key
11+
nomad3.local nomad_node_role=client ansible_ssh_user=vagrant ansible_ssh_private_key_file=./.vagrant/machines/nomad3/virtualbox/private_key

0 commit comments

Comments
 (0)