Add purge_networks arg to docker driver (#1543)

Users building containers in isolated docker networks may not want the default docker bridge network attached. Signed-off-by: Logan V <logan2211@gmail.com>
ansible · Feb 27, 2019 · ea97023 · ea97023
1 parent a72236b
commit ea97023
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/molecule/driver/docker.py b/molecule/driver/docker.py
@@ -82,6 +82,7 @@ class Docker(base.Base):
               - name: foo
               - name: bar
             network_mode: host
+            purge_networks: true
             docker_host: tcp://localhost:12376
             env:
               FOO: bar

diff --git a/molecule/model/schema_v2.py b/molecule/model/schema_v2.py
@@ -725,6 +725,9 @@ def pre_validate_base_schema(env, keep_string):
                 'network_mode': {
                     'type': 'string',
                 },
+                'purge_networks': {
+                    'type': 'boolean',
+                }
             }
         }
     },

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

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

diff --git a/test/unit/model/v2/test_platforms_section.py b/test/unit/model/v2/test_platforms_section.py
@@ -101,6 +101,8 @@ def _model_platforms_docker_section_data():
             ],
             'network_mode':
             'mode',
+            'purge_networks':
+            True,
             'foo':
             'bar'
         }]
@@ -167,6 +169,7 @@ def _model_platforms_docker_errors_section_data():
                 },
             ],
             'network_mode': int(),
+            'purge_networks': int(),
         }]
     }
 
@@ -221,6 +224,7 @@ def test_platforms_docker_has_errors(_config):
                     }]
                 }],
                 'network_mode': ['must be of string type'],
+                'purge_networks': ['must be of boolean type'],
                 'ulimits': [{
                     0: ['must be of string type']
                 }],