Skip to content

Commit

Permalink
Merge pull request #39148 from a-schuurman/feature/dockerng-module-ipv4
Browse files Browse the repository at this point in the history
Added ipv4 arg to connect_container_to_network
  • Loading branch information
Mike Place authored Feb 3, 2017
2 parents fa52556 + cddcb99 commit 0a8c7e4
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions salt/modules/dockerng.py
Original file line number Diff line number Diff line change
Expand Up @@ -4621,7 +4621,7 @@ def inspect_network(network_id):

@_api_version(1.21)
@_client_version('1.5.0')
def connect_container_to_network(container, network_id):
def connect_container_to_network(container, network_id, ipv4_address=None):
'''
Connect container to network.
Expand All @@ -4631,6 +4631,9 @@ def connect_container_to_network(container, network_id):
network_id
ID of network
ipv4_address
The IPv4 address to connect to the container
CLI Example:
.. code-block:: bash
Expand All @@ -4639,7 +4642,8 @@ def connect_container_to_network(container, network_id):
'''
response = _client_wrapper('connect_container_to_network',
container,
network_id)
network_id,
ipv4_address)
_clear_context()
# Only non-error return case is a True return, so just return the response
return response
Expand Down

0 comments on commit 0a8c7e4

Please sign in to comment.