Additional tweaks
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/11a9f21f Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/11a9f21f Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/11a9f21f Branch: refs/heads/BIGTOP-2982 Commit: 11a9f21f0c90667a3636904248aeb17940504e7f Parents: 30d345f Author: Olaf Flebbe <[email protected]> Authored: Tue Jan 9 20:42:13 2018 +0100 Committer: Olaf Flebbe <[email protected]> Committed: Tue Jan 9 20:42:13 2018 +0100 ---------------------------------------------------------------------- bigtop-deploy/puppet/manifests/site.pp | 4 ++++ provisioner/compose/docker-compose.yml | 25 ++++--------------------- 2 files changed, 8 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/11a9f21f/bigtop-deploy/puppet/manifests/site.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/manifests/site.pp b/bigtop-deploy/puppet/manifests/site.pp index 4763db6..f22df05 100644 --- a/bigtop-deploy/puppet/manifests/site.pp +++ b/bigtop-deploy/puppet/manifests/site.pp @@ -16,6 +16,10 @@ require jdk Class['jdk'] -> Service<||> +Service { + provider => init, +} + $provision_repo = hiera("bigtop::provision_repo", true) if ($provision_repo) { require bigtop_repo http://git-wip-us.apache.org/repos/asf/bigtop/blob/11a9f21f/provisioner/compose/docker-compose.yml ---------------------------------------------------------------------- diff --git a/provisioner/compose/docker-compose.yml b/provisioner/compose/docker-compose.yml index a5bfca0..7e95dc3 100644 --- a/provisioner/compose/docker-compose.yml +++ b/provisioner/compose/docker-compose.yml @@ -20,9 +20,9 @@ services: context: ../.. dockerfile: provisioner/compose/Dockerfile command: /sbin/init + image: oflebbe/node domainname: bigtop.org hostname: datanode1 - container_name: datanode1 networks: bigtop.org: aliases: @@ -30,14 +30,9 @@ services: volumes: - /data/1 - /data/2 - - /sys/fs/cgroup:/sys/fs/cgroup:ro tmpfs: - /run - /tmp - security_opt: - - seccomp=unconfined - cap_add: - - SYS_ADMIN datanode2: build: @@ -45,22 +40,16 @@ services: dockerfile: provisioner/compose/Dockerfile command: /sbin/init domainname: bigtop.org - container_name: datanode2 + image: oflebbe/node hostname: datanode2 networks: bigtop.org: volumes: - /data/1 - /data/2 - - /sys/fs/cgroup:/sys/fs/cgroup:ro tmpfs: - /run - /tmp - security_opt: - - seccomp=unconfined - cap_add: - - SYS_ADMIN - @@ -70,26 +59,20 @@ services: dockerfile: provisioner/compose/Dockerfile command: /sbin/init domainname: bigtop.org + image: oflebbe/node hostname: headnode - container_name: headnode networks: - bigtop.org volumes: - /data/1 - /data/2 - - /sys/fs/cgroup:/sys/fs/cgroup:ro tmpfs: - /run - /tmp - security_opt: - - seccomp=unconfined - cap_add: - - SYS_ADMIN - networks: bigtop.org: external: - name: bigtop.org + name: bigtop
