Do not remove trailing spaces when reading public key in keypair module
Previously, openstack.cloud.keypair would remove trailing spaces after reading a public key from a file. The openstack cli tool, python-\ openstackclient, does not do so, i.e. it does not use rstrip to remove spaces at the end [1]. This breaks idempotency when using openstack cli tool and our keypair module at the same time. The rstrip code was introduced to keypair when our modules were still part of ansible (non-core) in a completely unrelated change [2]. Now, keypair module does no longer alter the public key and instead uploads it unchanged to OpenStack API. [1]7df94c9f82/openstackclient/compute/v2/keypair.py (L103)
[2]341efbf7ae
Story: 2008574 Task: 41726 Change-Id: Ia09658467d98516ca1ea612e7301629b2f69d2d1
This commit is contained in:
parent
f2bf56d984
commit
73827a3d57
|
@ -139,7 +139,7 @@ class KeyPairModule(OpenStackModule):
|
|||
|
||||
if self.params['public_key_file']:
|
||||
with open(self.params['public_key_file']) as public_key_fh:
|
||||
public_key = public_key_fh.read().rstrip()
|
||||
public_key = public_key_fh.read()
|
||||
|
||||
keypair = self.conn.compute.find_keypair(name)
|
||||
|
||||
|
|
Loading…
Reference in New Issue