diff --git a/paunch/builder/podman.py b/paunch/builder/podman.py index 0d201ec..0d78020 100644 --- a/paunch/builder/podman.py +++ b/paunch/builder/podman.py @@ -76,6 +76,10 @@ class PodmanBuilder(base.BaseBuilder): self.string_arg(cconfig, cmd, 'mem_swappiness', '--memory-swappiness') self.string_arg(cconfig, cmd, 'security_opt', '--security-opt') self.string_arg(cconfig, cmd, 'stop_signal', '--stop-signal') + self.string_arg(cconfig, cmd, 'hostname', '--hostname') + for extra_host in cconfig.get('extra_hosts', []): + if extra_host: + cmd.append('--add-host=%s' % extra_host) self.string_arg(cconfig, cmd, 'stop_grace_period', '--stop-timeout', diff --git a/paunch/tests/test_builder_podman.py b/paunch/tests/test_builder_podman.py index c15cfcd..0c9580f 100644 --- a/paunch/tests/test_builder_podman.py +++ b/paunch/tests/test_builder_podman.py @@ -36,7 +36,12 @@ class TestPodmanBuilder(base.TestBaseBuilder): 'mem_swappiness': '60', 'security_opt': 'label:disable', 'cap_add': ['SYS_ADMIN', 'SETUID'], - 'cap_drop': ['NET_RAW'] + 'cap_drop': ['NET_RAW'], + 'hostname': 'foohostname', + 'extra_hosts': [ + 'foohost:127.0.0.1', + 'barhost:127.0.0.2' + ] } } builder = podman.PodmanBuilder('foo', config, None) @@ -55,6 +60,9 @@ class TestPodmanBuilder(base.TestBaseBuilder): '--memory-swap=1G', '--memory-swappiness=60', '--security-opt=label:disable', + '--hostname=foohostname', + '--add-host=foohost:127.0.0.1', + '--add-host=barhost:127.0.0.2', '--cap-add=SYS_ADMIN', '--cap-add=SETUID', '--cap-drop=NET_RAW', 'centos:7'], cmd diff --git a/releasenotes/notes/hostname-and-extra_hosts-args-27335af0a5694ba6.yaml b/releasenotes/notes/hostname-and-extra_hosts-args-27335af0a5694ba6.yaml new file mode 100644 index 0000000..83ca577 --- /dev/null +++ b/releasenotes/notes/hostname-and-extra_hosts-args-27335af0a5694ba6.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + paunch learns 'hostname' wich maps to podman run --hostname and + 'extra_hosts' mapping to podman run --add-host.