cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use {0}, {1} style format indices for 2.6 compat

Browse source
This commit is contained in:
Ash Wilson 2015-03-09 12:54:22 -04:00
parent 19664a96db
commit 0969fd75c8
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
cloud/docker/docker.py
View file

@ -787,7 +787,7 @@ class DockerManager(object):
# will be restarted when new versions of an existing image are # will be restarted when new versions of an existing image are
# pulled. # pulled.
if container['Image'] != image['Id']: if container['Image'] != image['Id']:
self.reload_reasons.append('image ({} => {})'.format(container['Image'], image['Id'])) self.reload_reasons.append('image ({0} => {1})'.format(container['Image'], image['Id']))
differing.append(container) differing.append(container)
continue continue
@ -799,7 +799,7 @@ class DockerManager(object):
actual_command = container["Config"]["Cmd"] actual_command = container["Config"]["Cmd"]
if actual_command != expected_command: if actual_command != expected_command:
self.reload_reasons.append('command ({} => {})'.format(actual_command, expected_command)) self.reload_reasons.append('command ({0} => {1})'.format(actual_command, expected_command))
differing.append(container) differing.append(container)
continue continue
@ -811,7 +811,7 @@ class DockerManager(object):
actually_exposed_ports = set((container["Config"]["ExposedPorts"] or {}).keys()) actually_exposed_ports = set((container["Config"]["ExposedPorts"] or {}).keys())
if actually_exposed_ports != expected_exposed_ports: if actually_exposed_ports != expected_exposed_ports:
self.reload_reasons.append('exposed_ports ({} => {})'.format(actually_exposed_ports, expected_exposed_ports)) self.reload_reasons.append('exposed_ports ({0} => {1})'.format(actually_exposed_ports, expected_exposed_ports))
differing.append(container) differing.append(container)
continue continue
@ -824,7 +824,7 @@ class DockerManager(object):
actual_volume_keys = set((container['Config']['Volumes'] or {}).keys()) actual_volume_keys = set((container['Config']['Volumes'] or {}).keys())
if actual_volume_keys != expected_volume_keys: if actual_volume_keys != expected_volume_keys:
self.reload_reasons.append('volumes ({} => {})'.format(actual_volume_keys, expected_volume_keys)) self.reload_reasons.append('volumes ({0} => {1})'.format(actual_volume_keys, expected_volume_keys))
differing.append(container) differing.append(container)
continue continue
@ -834,7 +834,7 @@ class DockerManager(object):
actual_mem = container['Config']['Memory'] actual_mem = container['Config']['Memory']
if expected_mem and actual_mem != expected_mem: if expected_mem and actual_mem != expected_mem:
self.reload_reasons.append('memory ({} => {})'.format(actual_mem, expected_mem)) self.reload_reasons.append('memory ({0} => {1})'.format(actual_mem, expected_mem))
differing.append(container) differing.append(container)
continue continue
@ -868,7 +868,7 @@ class DockerManager(object):
expected_hostname = self.module.params.get('hostname') expected_hostname = self.module.params.get('hostname')
actual_hostname = container['Config']['Hostname'] actual_hostname = container['Config']['Hostname']
if expected_hostname and actual_hostname != expected_hostname: if expected_hostname and actual_hostname != expected_hostname:
self.reload_reasons.append('hostname ({} => {})'.format(actual_hostname, expected_hostname)) self.reload_reasons.append('hostname ({0} => {1})'.format(actual_hostname, expected_hostname))
differing.append(container) differing.append(container)
continue continue
@ -877,7 +877,7 @@ class DockerManager(object):
expected_domainname = self.module.params.get('domainname') expected_domainname = self.module.params.get('domainname')
actual_domainname = container['Config']['Domainname'] actual_domainname = container['Config']['Domainname']
if expected_domainname and actual_domainname != expected_domainname: if expected_domainname and actual_domainname != expected_domainname:
self.reload_reasons.append('domainname ({} => {})'.format(actual_domainname, expected_domainname)) self.reload_reasons.append('domainname ({0} => {1})'.format(actual_domainname, expected_domainname))
differing.append(container) differing.append(container)
continue continue
@ -897,7 +897,7 @@ class DockerManager(object):
expected_stdin_open = self.module.params.get('stdin_open') expected_stdin_open = self.module.params.get('stdin_open')
actual_stdin_open = container['Config']['AttachStdin'] actual_stdin_open = container['Config']['AttachStdin']
if actual_stdin_open != expected_stdin_open: if actual_stdin_open != expected_stdin_open:
self.reload_reasons.append('stdin_open ({} => {})'.format(actual_stdin_open, expected_stdin_open)) self.reload_reasons.append('stdin_open ({0} => {1})'.format(actual_stdin_open, expected_stdin_open))
differing.append(container) differing.append(container)
continue continue
@ -906,7 +906,7 @@ class DockerManager(object):
expected_tty = self.module.params.get('tty') expected_tty = self.module.params.get('tty')
actual_tty = container['Config']['Tty'] actual_tty = container['Config']['Tty']
if actual_tty != expected_tty: if actual_tty != expected_tty:
self.reload_reasons.append('tty ({} => {})'.format(actual_tty, expected_tty)) self.reload_reasons.append('tty ({0} => {1})'.format(actual_tty, expected_tty))
differing.append(container) differing.append(container)
continue continue
@ -918,7 +918,7 @@ class DockerManager(object):
expected_lxc = set(self.lxc_conf) expected_lxc = set(self.lxc_conf)
actual_lxc = set(container['HostConfig']['LxcConf'] or []) actual_lxc = set(container['HostConfig']['LxcConf'] or [])
if actual_lxc != expected_lxc: if actual_lxc != expected_lxc:
self.reload_reasons.append('lxc_conf ({} => {})'.format(actual_lxc, expected_lxc)) self.reload_reasons.append('lxc_conf ({0} => {1})'.format(actual_lxc, expected_lxc))
differing.append(container) differing.append(container)
continue continue
@ -936,7 +936,7 @@ class DockerManager(object):
else: else:
container_path = config container_path = config
mode = 'rw' mode = 'rw'
expected_binds.add("{}:{}:{}".format(host_path, container_path, mode)) expected_binds.add("{0}:{1}:{2}".format(host_path, container_path, mode))
actual_binds = set() actual_binds = set()
for bind in (container['HostConfig']['Binds'] or []): for bind in (container['HostConfig']['Binds'] or []):
@ -946,7 +946,7 @@ class DockerManager(object):
actual_binds.add(bind) actual_binds.add(bind)
if actual_binds != expected_binds: if actual_binds != expected_binds:
self.reload_reasons.append('binds ({} => {})'.format(actual_binds, expected_binds)) self.reload_reasons.append('binds ({0} => {1})'.format(actual_binds, expected_binds))
differing.append(container) differing.append(container)
continue continue
@ -956,7 +956,7 @@ class DockerManager(object):
if self.port_bindings: if self.port_bindings:
for container_port, config in self.port_bindings.iteritems(): for container_port, config in self.port_bindings.iteritems():
if isinstance(container_port, int): if isinstance(container_port, int):
container_port = "{}/tcp".format(container_port) container_port = "{0}/tcp".format(container_port)
bind = {} bind = {}
if len(config) == 1: if len(config) == 1:
bind['HostIp'] = "0.0.0.0" bind['HostIp'] = "0.0.0.0"
@ -970,7 +970,7 @@ class DockerManager(object):
actual_bound_ports = container['HostConfig']['PortBindings'] or {} actual_bound_ports = container['HostConfig']['PortBindings'] or {}
if actual_bound_ports != expected_bound_ports: if actual_bound_ports != expected_bound_ports:
self.reload_reasons.append('port bindings ({} => {})'.format(actual_bound_ports, expected_bound_ports)) self.reload_reasons.append('port bindings ({0} => {1})'.format(actual_bound_ports, expected_bound_ports))
differing.append(container) differing.append(container)
continue continue
@ -984,7 +984,7 @@ class DockerManager(object):
expected_privileged = self.module.params.get('privileged') expected_privileged = self.module.params.get('privileged')
actual_privileged = container['HostConfig']['Privileged'] actual_privileged = container['HostConfig']['Privileged']
if actual_privileged != expected_privileged: if actual_privileged != expected_privileged:
self.reload_reasons.append('privileged ({} => {})'.format(actual_privileged, expected_privileged)) self.reload_reasons.append('privileged ({0} => {1})'.format(actual_privileged, expected_privileged))
differing.append(container) differing.append(container)
continue continue
@ -992,11 +992,11 @@ class DockerManager(object):
expected_links = set() expected_links = set()
for link, alias in (self.links or {}).iteritems(): for link, alias in (self.links or {}).iteritems():
expected_links.add("/{}:/running/{}".format(link, alias)) expected_links.add("/{0}:/running/{1}".format(link, alias))
actual_links = set(container['HostConfig']['Links'] or []) actual_links = set(container['HostConfig']['Links'] or [])
if actual_links != expected_links: if actual_links != expected_links:
self.reload_reasons.append('links ({} => {})'.format(actual_links, expected_links)) self.reload_reasons.append('links ({0} => {1})'.format(actual_links, expected_links))
differing.append(container) differing.append(container)
continue continue
@ -1005,7 +1005,7 @@ class DockerManager(object):
expected_netmode = self.module.params.get('net') or '' expected_netmode = self.module.params.get('net') or ''
actual_netmode = container['HostConfig']['NetworkMode'] actual_netmode = container['HostConfig']['NetworkMode']
if actual_netmode != expected_netmode: if actual_netmode != expected_netmode:
self.reload_reasons.append('net ({} => {})'.format(actual_netmode, expected_netmode)) self.reload_reasons.append('net ({0} => {1})'.format(actual_netmode, expected_netmode))
differing.append(container) differing.append(container)
continue continue
@ -1014,7 +1014,7 @@ class DockerManager(object):
expected_dns = set(self.module.params.get('dns') or []) expected_dns = set(self.module.params.get('dns') or [])
actual_dns = set(container['HostConfig']['Dns'] or []) actual_dns = set(container['HostConfig']['Dns'] or [])
if actual_dns != expected_dns: if actual_dns != expected_dns:
self.reload_reasons.append('dns ({} => {})'.format(actual_dns, expected_dns)) self.reload_reasons.append('dns ({0} => {1})'.format(actual_dns, expected_dns))
differing.append(container) differing.append(container)
continue continue
@ -1023,7 +1023,7 @@ class DockerManager(object):
expected_volumes_from = set(self.module.params.get('volumes_from') or []) expected_volumes_from = set(self.module.params.get('volumes_from') or [])
actual_volumes_from = set(container['HostConfig']['VolumesFrom'] or []) actual_volumes_from = set(container['HostConfig']['VolumesFrom'] or [])
if actual_volumes_from != expected_volumes_from: if actual_volumes_from != expected_volumes_from:
self.reload_reasons.append('volumes_from ({} => {})'.format(actual_volumes_from, expected_volumes_from)) self.reload_reasons.append('volumes_from ({0} => {1})'.format(actual_volumes_from, expected_volumes_from))
differing.append(container) differing.append(container)
return differing return differing