valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #39148 from a-schuurman/feature/dockerng-module-ipv4

Browse Source 
Added ipv4 arg to connect_container_to_network
This commit is contained in:
Mike Place 2017-02-03 10:15:17 -07:00 committed by GitHub
commit 0a8c7e451b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/dockerng.py
View File

@ -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.
@ -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
@ -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