jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3994 from shin-/3430-enable-ipv6

Browse source 
Add support for enable_ipv6 in network definition.
This commit is contained in:
Joffrey F 2016-10-17 11:02:00 -07:00 • committed by GitHub
commit 95c6cc0420
3 changed files with 51 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compose/config/config_schema_v2.1.json
View file

@ -246,7 +246,8 @@
"name": {"type": "string"}
},
"additionalProperties": false
}
},
"enable_ipv6": {"type": "boolean"}
},
"additionalProperties": false
},

5
compose/network.py
View file

@ -15,7 +15,7 @@ log = logging.getLogger(__name__)
class Network(object):
def __init__(self, client, project, name, driver=None, driver_opts=None,
ipam=None, external_name=None, internal=False):
ipam=None, external_name=None, internal=False, enable_ipv6=False):
self.client = client
self.project = project
self.name = name
@ -24,6 +24,7 @@ class Network(object):
self.ipam = create_ipam_config_from_dict(ipam)
self.external_name = external_name
self.internal = internal
self.enable_ipv6 = enable_ipv6
def ensure(self):
if self.external_name:
@ -70,6 +71,7 @@ class Network(object):
options=self.driver_opts,
ipam=self.ipam,
internal=self.internal,
enable_ipv6=self.enable_ipv6
)
def remove(self):
@ -118,6 +120,7 @@ def build_networks(name, config_data, client):
ipam=data.get('ipam'),
external_name=data.get('external_name'),
internal=data.get('internal'),
enable_ipv6=data.get('enable_ipv6'),
)
for network_name, data in network_config.items()
}