From 653353ea4bd7119039a0ca347a683a2bfa8b475f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 27 Apr 2015 09:48:06 +0000 Subject: [PATCH] allow fed-cloud09 to log to itself so packstack can configure swift. And unify the ssh key deployment --- files/fedora-cloud/fed09-ssh-key.pub | 1 - playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml | 3 ++- roles/cloud_compute/tasks/main.yml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 files/fedora-cloud/fed09-ssh-key.pub diff --git a/files/fedora-cloud/fed09-ssh-key.pub b/files/fedora-cloud/fed09-ssh-key.pub deleted file mode 100644 index 3885ced01f..0000000000 --- a/files/fedora-cloud/fed09-ssh-key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZAnj+U9s4Xn36DpQYOfAhW2Q1ZQqkKASvG3rJNsOCpRlvWGcmxrvjUr5mQ3ZMapEu0IaaQUq40JvP8iqJ1HIq4C8UXLBq9SFEfeNYh5qRqEpEn5CRcjrJPwFf6jLpr3bN+F98Vo3E/FMgJ3MzBsynZoT+A6d02oitoxV6DomDB7gXU08Pfz7oQYXBzAVe3+BP4IaeUWbjHDv57LGBa/Xfw5SKrgk+/IKXIGk2Rkxn7sShtHzkpkI4waNl4gqUzwsJ/Y+FJxpI1DvWxHuzlx1uOLupxYA9p+ejJo5sXGZtO2Ynx2NFEjIzqmBljaiy+wmDYvZz2JdIFwSAjPbaFjtF root@fed-cloud09.cloud.fedoraproject.org diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index a8270f880f..f9ab8f1721 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -251,7 +251,8 @@ insertbefore="^}" # http://openstack.redhat.com/Quickstart - template: src={{ files }}/fedora-cloud/packstack-controller-answers.txt dest=/root/ owner=root mode=0600 - - authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" + - name: SSH authorized key for root user + authorized_key: user=root key="{{fed_cloud09_root_public_key}}" - command: packstack --answer-file=/root/packstack-controller-answers.txt when: packstack_sucessfully_finished.stat.exists == False - file: path=/etc/packstack_sucessfully_finished state=touch diff --git a/roles/cloud_compute/tasks/main.yml b/roles/cloud_compute/tasks/main.yml index d61a6c5753..d311e018bb 100644 --- a/roles/cloud_compute/tasks/main.yml +++ b/roles/cloud_compute/tasks/main.yml @@ -1,7 +1,8 @@ --- # Configure another compute node for Fedora Cloud -- authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" +- name: SSH authorized key for root user + authorized_key: user=root key="{{fed_cloud09_root_public_key}}" - template: src={{ files }}/fedora-cloud/hosts dest=/etc/hosts owner=root mode=0644 - lineinfile: dest=/etc/sysconfig/network-scripts/ifcfg-eth1 regexp="^ONBOOT=" line="ONBOOT=yes"