cs_sshkeypair: fix ssh key rename (#36726)

* tests: cs_sshkeypair: add reproducer for failed key rename

* cs_sshkeypair: fix rename ssh key
pull/36273/merge
René Moser 7 years ago committed by GitHub
parent 487ff1fe9b
commit cdb2969703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -169,7 +169,7 @@ class AnsibleCloudStackSshKey(AnsibleCloudStack):
# We need to make another lookup if there is a key with identical name. # We need to make another lookup if there is a key with identical name.
self.ssh_key = None self.ssh_key = None
ssh_key = self.get_ssh_key() ssh_key = self.get_ssh_key()
if ssh_key['fingerprint'] != fingerprint: if ssh_key and ssh_key['fingerprint'] != fingerprint:
args['name'] = name args['name'] = name
self.query_api('deleteSSHKeyPair', **args) self.query_api('deleteSSHKeyPair', **args)

@ -1,9 +1,17 @@
--- ---
- name: setup cleanup - name: setup cleanup
cs_sshkeypair: name=first-sshkey state=absent cs_sshkeypair:
name: "{{ item }}"
- name: setup cleanup state: absent
cs_sshkeypair: name=second-sshkey state=absent register: sshkey
with_items:
- first-sshkey
- first-sshkey-renamed
- second-sshkey
- name: verify setup cleanup
assert:
that:
- sshkey is success
- name: test fail on missing name - name: test fail on missing name
action: cs_sshkeypair action: cs_sshkeypair
@ -17,7 +25,7 @@
- name: test ssh key creation in check mode - name: test ssh key creation in check mode
cs_sshkeypair: cs_sshkeypair:
name: "first-sshkey" name: first-sshkey
register: sshkey register: sshkey
check_mode: true check_mode: true
- name: verify results of ssh key creation in check mode - name: verify results of ssh key creation in check mode
@ -28,7 +36,7 @@
- name: test ssh key creation - name: test ssh key creation
cs_sshkeypair: cs_sshkeypair:
name: "first-sshkey" name: first-sshkey
register: sshkey register: sshkey
- name: verify results of ssh key creation - name: verify results of ssh key creation
assert: assert:
@ -41,7 +49,7 @@
- name: test ssh key creation idempotence - name: test ssh key creation idempotence
cs_sshkeypair: cs_sshkeypair:
name: "first-sshkey" name: first-sshkey
register: sshkey2 register: sshkey2
- name: verify results of ssh key creation idempotence - name: verify results of ssh key creation idempotence
assert: assert:
@ -54,7 +62,7 @@
- name: test replace ssh public key in check mode - name: test replace ssh public key in check mode
cs_sshkeypair: cs_sshkeypair:
name: "first-sshkey" name: first-sshkey
public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch" public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
register: sshkey2 register: sshkey2
check_mode: true check_mode: true
@ -69,13 +77,12 @@
- name: test replace ssh public key - name: test replace ssh public key
cs_sshkeypair: cs_sshkeypair:
name: "first-sshkey" name: first-sshkey
public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch" public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
register: sshkey3 register: sshkey3
- name: verify results of replace ssh public key - name: verify results of replace ssh public key
assert: assert:
that: that:
- sshkey3 is successful
- sshkey3 is changed - sshkey3 is changed
- sshkey3.fingerprint is defined and sshkey3.fingerprint != sshkey2.fingerprint - sshkey3.fingerprint is defined and sshkey3.fingerprint != sshkey2.fingerprint
- sshkey3.private_key is not defined - sshkey3.private_key is not defined
@ -83,31 +90,69 @@
- name: test replace ssh public key idempotence - name: test replace ssh public key idempotence
cs_sshkeypair: cs_sshkeypair:
name: "first-sshkey" name: first-sshkey
public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch" public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
register: sshkey4 register: sshkey4
- name: verify results of ssh public key idempotence - name: verify results of ssh public key idempotence
assert: assert:
that: that:
- sshkey4 is successful
- sshkey4 is not changed - sshkey4 is not changed
- sshkey4.fingerprint is defined and sshkey4.fingerprint == sshkey3.fingerprint - sshkey4.fingerprint is defined and sshkey4.fingerprint == sshkey3.fingerprint
- sshkey4.private_key is not defined - sshkey4.private_key is not defined
- sshkey4.name == "first-sshkey" - sshkey4.name == "first-sshkey"
- name: setup ssh key with name "second-sshke" - name: test rename ssh key in check mode
cs_sshkeypair: cs_sshkeypair:
name: "second-sshkey" name: first-sshkey-renamed
public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
register: sshkey4
check_mode: true
- name: verify test rename ssh key in check mode
assert:
that:
- sshkey4 is changed
- sshkey4.fingerprint is defined and sshkey4.fingerprint == sshkey3.fingerprint
- sshkey4.private_key is not defined
- sshkey4.name == "first-sshkey"
- name: test rename ssh key
cs_sshkeypair:
name: first-sshkey-renamed
public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
register: sshkey4
- name: verify test rename ssh key
assert:
that:
- sshkey4 is changed
- sshkey4.fingerprint is defined and sshkey4.fingerprint == sshkey3.fingerprint
- sshkey4.private_key is not defined
- sshkey4.name == "first-sshkey-renamed"
- name: test rename ssh key idempotence
cs_sshkeypair:
name: first-sshkey-renamed
public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
register: sshkey4
- name: verify test rename ssh key idempotence
assert:
that:
- sshkey4 is not changed
- sshkey4.fingerprint is defined and sshkey4.fingerprint == sshkey3.fingerprint
- sshkey4.private_key is not defined
- sshkey4.name == "first-sshkey-renamed"
- name: setup ssh key with name "second-sshkey"
cs_sshkeypair:
name: second-sshkey
- name: test different but exisitng name but same ssh public key as first-sshkey - name: test different but exisitng name but same ssh public key as first-sshkey
cs_sshkeypair: cs_sshkeypair:
name: "second-sshkey" name: second-sshkey
public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch" public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
register: sshkey register: sshkey
- name: verify test different but exisitng name but same ssh public key as first-sshkey - name: verify test different but exisitng name but same ssh public key as first-sshkey
assert: assert:
that: that:
- sshkey is successful
- sshkey is changed - sshkey is changed
- sshkey.fingerprint is defined and sshkey.fingerprint == sshkey4.fingerprint - sshkey.fingerprint is defined and sshkey.fingerprint == sshkey4.fingerprint
- sshkey.private_key is not defined - sshkey.private_key is not defined
@ -120,31 +165,32 @@
- name: verify result of key absent in check mode - name: verify result of key absent in check mode
assert: assert:
that: that:
- sshkey5 is successful
- sshkey5 is changed - sshkey5 is changed
- sshkey5.fingerprint is defined and sshkey5.fingerprint == sshkey3.fingerprint - sshkey5.fingerprint is defined and sshkey5.fingerprint == sshkey3.fingerprint
- sshkey5.private_key is not defined - sshkey5.private_key is not defined
- sshkey5.name == "second-sshkey" - sshkey5.name == "second-sshkey"
- name: test ssh key absent - name: test ssh key absent
cs_sshkeypair: name=second-sshkey state=absent cs_sshkeypair:
name: second-sshkey
state: absent
register: sshkey5 register: sshkey5
- name: verify result of key absent - name: verify result of key absent
assert: assert:
that: that:
- sshkey5 is successful
- sshkey5 is changed - sshkey5 is changed
- sshkey5.fingerprint is defined and sshkey5.fingerprint == sshkey3.fingerprint - sshkey5.fingerprint is defined and sshkey5.fingerprint == sshkey3.fingerprint
- sshkey5.private_key is not defined - sshkey5.private_key is not defined
- sshkey5.name == "second-sshkey" - sshkey5.name == "second-sshkey"
- name: test ssh key absent idempotence - name: test ssh key absent idempotence
cs_sshkeypair: name=second-sshkey state=absent cs_sshkeypair:
name: second-sshkey
state: absent
register: sshkey6 register: sshkey6
- name: verify result of ssh key absent idempotence - name: verify result of ssh key absent idempotence
assert: assert:
that: that:
- sshkey6 is successful
- sshkey6 is not changed - sshkey6 is not changed
- sshkey6.fingerprint is not defined - sshkey6.fingerprint is not defined
- sshkey6.private_key is not defined - sshkey6.private_key is not defined

Loading…
Cancel
Save