ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-08 02:01:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

docker_swarm_service: Use str type for configs/secrets gid/uid (#55591)

Browse source 
* Change type of secrets gid/uid to str
* Add changelog fragment

Co-Authored-By: hannseman <hannes@5monkeys.se>
This commit is contained in:
Hannes Ljungberg 2019-04-22 17:29:46 +02:00 • committed by Sam Doran
parent a8c3eeaa3d
commit 14c60e6ec8
5 changed files with 753 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/ansible/modules/cloud/docker/docker_swarm_service.py
View file

@ -58,15 +58,15 @@ options:
uid:
description:
- UID of the config file's owner.
type: int
type: str
gid:
description:
- GID of the config file's group.
type: int
type: str
mode:
description:
- File access mode inside the container.
type: str
- File access mode inside the container. Must be an octal number (like C(0644) or C(0444)).
type: int
constraints:
description:
- List of the service constraints.
@ -611,14 +611,14 @@ options:
uid:
description:
- UID of the secret file's owner.
type: int
type: str
gid:
description:
- GID of the secret file's group.
type: int
type: str
mode:
description:
- File access mode inside the container.
- File access mode inside the container. Must be an octal number (like C(0644) or C(0444)).
type: int
state:
description:
@ -2250,8 +2250,8 @@ class DockerServiceManager(object):
'config_id': config_data['ConfigID'],
'config_name': config_data['ConfigName'],
'filename': config_data['File'].get('Name'),
'uid': int(config_data['File'].get('UID')),
'gid': int(config_data['File'].get('GID')),
'uid': config_data['File'].get('UID'),
'gid': config_data['File'].get('GID'),
'mode': config_data['File'].get('Mode')
})
@ -2263,8 +2263,8 @@ class DockerServiceManager(object):
'secret_id': secret_data['SecretID'],
'secret_name': secret_data['SecretName'],
'filename': secret_data['File'].get('Name'),
'uid': int(secret_data['File'].get('UID')),
'gid': int(secret_data['File'].get('GID')),
'uid': secret_data['File'].get('UID'),
'gid': secret_data['File'].get('GID'),
'mode': secret_data['File'].get('Mode')
})
@ -2506,16 +2506,16 @@ def main():
config_id=dict(type='str', required=True),
config_name=dict(type='str', required=True),
filename=dict(type='str'),
uid=dict(type='int'),
gid=dict(type='int'),
uid=dict(type='str'),
gid=dict(type='str'),
mode=dict(type='int'),
)),
secrets=dict(type='list', elements='dict', options=dict(
secret_id=dict(type='str', required=True),
secret_name=dict(type='str', required=True),
filename=dict(type='str'),
uid=dict(type='int'),
gid=dict(type='int'),
uid=dict(type='str'),
gid=dict(type='str'),
mode=dict(type='int'),
)),
networks=dict(type='list', elements='str'),