From 0c874a022b3e6d20d6e18a4eee992a07653a5f99 Mon Sep 17 00:00:00 2001 From: Felix Fontein <felix@fontein.de> Date: Wed, 27 Feb 2019 07:42:34 +0100 Subject: [PATCH] Fix types for signing_ca_cert and signing_ca_key options (changed wrongly in #52422). (#53038) --- lib/ansible/modules/cloud/docker/docker_swarm.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/ansible/modules/cloud/docker/docker_swarm.py b/lib/ansible/modules/cloud/docker/docker_swarm.py index 267bf1b192..de9a5ea1ea 100644 --- a/lib/ansible/modules/cloud/docker/docker_swarm.py +++ b/lib/ansible/modules/cloud/docker/docker_swarm.py @@ -127,11 +127,13 @@ options: signing_ca_cert: description: - The desired signing CA certificate for all swarm node TLS leaf certificates, in PEM format. - type: path + - This must not be a path to a certificate, but the contents of the certificate. + type: str signing_ca_key: description: - The desired signing CA key for all swarm node TLS leaf certificates, in PEM format. - type: path + - This must not be a path to a key, but the contents of the key. + type: str ca_force_rotate: description: - An integer whose purpose is to force swarm to generate a new signing CA certificate and key, @@ -530,8 +532,8 @@ def main(): node_cert_expiry=dict(type='int'), name=dict(type='str'), labels=dict(type='dict'), - signing_ca_cert=dict(type='path'), - signing_ca_key=dict(type='path'), + signing_ca_cert=dict(type='str'), + signing_ca_key=dict(type='str'), ca_force_rotate=dict(type='int'), autolock_managers=dict(type='bool'), node_id=dict(type='str'),