Skip to content

Commit 826c02c

Browse files
author
Cosmin Lehene
committed
Changed $work_dir defaults to /var/lib/mesos/{master, slave}
Ensure the directories are created with mkdir -p
1 parent 1c8b406 commit 826c02c

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

manifests/master.pp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
$enable = true,
2424
$cluster = 'mesos',
2525
$conf_dir = '/etc/mesos-master',
26-
$work_dir = '/var/lib/mesos', # registrar directory, since 0.19
26+
$work_dir = '/var/lib/mesos/master', # registrar directory, since 0.19
2727
$conf_file = '/etc/default/mesos-master',
2828
$acls_file = '/etc/mesos/acls',
2929
$credentials_file = '/etc/mesos/master-credentials',
@@ -96,6 +96,8 @@
9696
group => $group,
9797
}
9898

99+
# TODO this duplicated in master / slave. move up
100+
common::mkdir_p { $work_dir: } ->
99101
file { $conf_dir:
100102
ensure => directory,
101103
}
@@ -110,6 +112,8 @@
110112
require => Class['::mesos::install'],
111113
}
112114

115+
# TODO this duplicated in master / slave. move up
116+
common::mkdir_p { $work_dir: } ->
113117
file { $work_dir:
114118
ensure => directory,
115119
}

manifests/slave.pp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
class mesos::slave (
5252
$enable = true,
5353
$port = 5051,
54-
$work_dir = '/tmp/mesos',
54+
$work_dir = '/var/lib/mesos/slave',
5555
$checkpoint = false,
5656
$isolation = '',
5757
$conf_dir = '/etc/mesos-slave',
@@ -104,6 +104,7 @@
104104
group => $group,
105105
}
106106

107+
common::mkdir_p { $conf_dir: } ->
107108
file { $conf_dir:
108109
ensure => directory,
109110
recurse => true,
@@ -173,6 +174,7 @@
173174
notify => Service['mesos-slave'],
174175
}
175176

177+
common::mkdir_p { $work_dir: } ->
176178
file { $work_dir:
177179
ensure => directory,
178180
}

0 commit comments

Comments
 (0)