Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-26-v01

1 files changed, 4 insertions, 0 deletions

diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp b/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp
index 8df416b..4b56a03 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp
@@ -7,6 +7,8 @@ define sunet::docker_run(
   $env                 = [],
   $net                 = 'bridge',
   $extra_parameters    = [],
+  $command             = "",
+  $hostname            = undef,
 ) {
 
   # Make container use unbound resolver on dockerhost
@@ -26,6 +28,7 @@ define sunet::docker_run(
                            '/etc/passwd:/etc/passwd:ro',  # uid consistency
                            '/etc/group:/etc/group:ro',    # gid consistency
                            ]),
+    hostname           => $hostname,
     ports              => $ports,
     env                => $env,
     net                => $net,
@@ -34,6 +37,7 @@ define sunet::docker_run(
                                    ]),
     dns                => $dns,
     verify_checksum    => false,    # Rely on registry security for now. eduID risk #31.
+    command            => $command,
     pre_start          => 'run-parts /usr/local/etc/docker.d',
     post_start         => 'run-parts /usr/local/etc/docker.d',
     pre_stop           => 'run-parts /usr/local/etc/docker.d',