wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove from sanity ignores. (#57911)

Browse source 
(cherry picked from commit 808cf4aa26)
This commit is contained in:
Felix Fontein 2019-06-23 14:20:26 +02:00 committed by Toshio Kuratomi
parent 6e2bcc3d8e
commit f4ff3ade1f
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/modules/cloud/docker/docker_network.py
View file

@ -303,7 +303,7 @@ class TaskParameters(DockerBaseClass):
super(TaskParameters, self).__init__()
self.client = client
self.network_name = None
self.name = None
self.connected = None
self.driver = None
self.driver_options = None
@ -400,7 +400,7 @@ class DockerNetworkManager(object):
self.results['diff'] = self.diff_result
def get_existing_network(self):
return self.client.get_network(name=self.parameters.network_name)
return self.client.get_network(name=self.parameters.name)
def has_different_config(self, net):
'''
@ -544,18 +544,18 @@ class DockerNetworkManager(object):
params['labels'] = self.parameters.labels
if not self.check_mode:
resp = self.client.create_network(self.parameters.network_name, **params)
resp = self.client.create_network(self.parameters.name, **params)
self.client.report_warnings(resp, ['Warning'])
self.existing_network = self.client.get_network(id=resp['Id'])
self.results['actions'].append("Created network %s with driver %s" % (self.parameters.network_name, self.parameters.driver))
self.results['actions'].append("Created network %s with driver %s" % (self.parameters.name, self.parameters.driver))
self.results['changed'] = True
def remove_network(self):
if self.existing_network:
self.disconnect_all_containers()
if not self.check_mode:
self.client.remove_network(self.parameters.network_name)
self.results['actions'].append("Removed network %s" % (self.parameters.network_name,))
self.client.remove_network(self.parameters.name)
self.results['actions'].append("Removed network %s" % (self.parameters.name,))
self.results['changed'] = True
def is_container_connected(self, container_name):
@ -565,7 +565,7 @@ class DockerNetworkManager(object):
for name in self.parameters.connected:
if not self.is_container_connected(name):
if not self.check_mode:
self.client.connect_container_to_network(name, self.parameters.network_name)
self.client.connect_container_to_network(name, self.parameters.name)
self.results['actions'].append("Connected container %s" % (name,))
self.results['changed'] = True
self.diff_tracker.add('connected.{0}'.format(name),
@ -584,7 +584,7 @@ class DockerNetworkManager(object):
self.disconnect_container(name)
def disconnect_all_containers(self):
containers = self.client.get_network(name=self.parameters.network_name)['Containers']
containers = self.client.get_network(name=self.parameters.name)['Containers']
if not containers:
return
for cont in containers.values():
@ -592,7 +592,7 @@ class DockerNetworkManager(object):
def disconnect_container(self, container_name):
if not self.check_mode:
self.client.disconnect_container_from_network(container_name, self.parameters.network_name)
self.client.disconnect_container_from_network(container_name, self.parameters.name)
self.results['actions'].append("Disconnected container %s" % (container_name,))
self.results['changed'] = True
self.diff_tracker.add('connected.{0}'.format(container_name),
@ -633,7 +633,7 @@ class DockerNetworkManager(object):
def main():
argument_spec = dict(
network_name=dict(type='str', required=True, aliases=['name']),
name=dict(type='str', required=True, aliases=['network_name']),
connected=dict(type='list', default=[], elements='str', aliases=['containers']),
state=dict(type='str', default='present', choices=['present', 'absent']),
driver=dict(type='str', default='bridge'),