Pass etc_hosts through to docker_container module if set in molecule …

…config (#1972) * set etc_hosts in docker_container module if set in molecule config Signed-off-by: Jeremy Zafran <[email protected]> * Add test for etc_hosts The "etc_hosts" is set to string for usability. More detail see, https://stackoverflow.com/questions/39224679/ansible-docker-container-etc-hosts-with-variable-key Signed-off-by: benjah1 <[email protected]> * add type dict to etc_hosts and fix unit test Signed-off-by: benjah1 <[email protected]>
ansible · Jun 6, 2019 · f6f986e · f6f986e
1 parent 9aaabee
commit f6f986e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/molecule/driver/docker.py b/molecule/driver/docker.py
@@ -82,6 +82,7 @@ class Docker(base.Base):
               - nofile:262144:262144
             dns_servers:
               - 8.8.8.8
+            etc_hosts: "{'host1.example.com': '10.3.1.5'}"
             networks:
               - name: foo
               - name: bar

diff --git a/molecule/model/schema_v2.py b/molecule/model/schema_v2.py
@@ -718,6 +718,12 @@ def pre_validate_base_schema(env, keep_string):
                         'type': 'string',
                     }
                 },
+                'etc_hosts': {
+                    'type': ['string', 'dict'],
+                    'keyschema': {
+                        'type': 'string',
+                    }
+                },
                 'env': {
                     'type': 'dict',
                     'keysrules': {

diff --git a/molecule/provisioner/ansible/playbooks/docker/create.yml b/molecule/provisioner/ansible/playbooks/docker/create.yml
@@ -87,6 +87,7 @@
         network_mode: "{{ item.network_mode | default(omit) }}"
         purge_networks: "{{ item.purge_networks | default(omit) }}"
         dns_servers: "{{ item.dns_servers | default(omit) }}"
+        etc_hosts: "{{ item.etc_hosts | default(omit) }}"
         env: "{{ item.env | default(omit) }}"
         restart_policy: "{{ item.restart_policy | default(omit) }}"
         restart_retries: "{{ item.restart_retries | default(omit) }}"

diff --git a/test/resources/playbooks/docker/create.yml b/test/resources/playbooks/docker/create.yml
@@ -88,6 +88,7 @@
         network_mode: "{{ item.network_mode | default(omit) }}"
         purge_networks: "{{ item.purge_networks | default(omit) }}"
         dns_servers: "{{ item.dns_servers | default(omit) }}"
+        etc_hosts: "{{ item.etc_hosts | default(omit) }}"
         env: "{{ item.env | default(omit) }}"
         restart_policy: "{{ item.restart_policy | default(omit) }}"
         restart_retries: "{{ item.restart_retries | default(omit) }}"

diff --git a/test/unit/model/v2/test_platforms_section.py b/test/unit/model/v2/test_platforms_section.py
@@ -87,6 +87,8 @@ def _model_platforms_docker_section_data():
             'dns_servers': [
                 '8.8.8.8',
             ],
+            'etc_hosts':
+            "{'host1.example.com': '10.3.1.5'}",
             'env': {
                 'FOO': 'bar',
                 'foo': 'bar',
@@ -198,6 +200,7 @@ def _model_platforms_docker_errors_section_data():
             'dns_servers': [
                 int(),
             ],
+            "etc_hosts": int(),
             'env': str(),
             'restart_policy': int(),
             'restart_retries': str(),
@@ -269,6 +272,7 @@ def test_platforms_docker_has_errors(_config):
                 'ulimits': [{
                     0: ['must be of string type']
                 }],
+                'etc_hosts': ['must be of [\'string\', \'dict\'] type'],
                 'env': ['must be of dict type'],
                 'restart_policy': ['must be of string type'],
                 'restart_retries': ['must be of integer type'],