summaryrefslogtreecommitdiffstats
path: root/tasks/cloud_setup_basic.yml
diff options
context:
space:
mode:
authorSeth Vidal <skvidal@fedoraproject.org>2012-11-02 06:22:19 +0000
committerSeth Vidal <skvidal@fedoraproject.org>2012-11-02 06:22:19 +0000
commit355c668d8c6d671d447f7710dce4f27bfd67c4b2 (patch)
tree2cba415f19f157cb7efad608e8cc3d34e83187a9 /tasks/cloud_setup_basic.yml
parent42c749ac8f5a6888f1af50d1f15e83043f74a167 (diff)
downloadansible-355c668d8c6d671d447f7710dce4f27bfd67c4b2.tar.gz
ansible-355c668d8c6d671d447f7710dce4f27bfd67c4b2.tar.xz
ansible-355c668d8c6d671d447f7710dce4f27bfd67c4b2.zip
make the ansible key addition and other users key addition a little less scary
Diffstat (limited to 'tasks/cloud_setup_basic.yml')
-rw-r--r--tasks/cloud_setup_basic.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml
index 1e2b699d1..5067cdb5d 100644
--- a/tasks/cloud_setup_basic.yml
+++ b/tasks/cloud_setup_basic.yml
@@ -25,18 +25,18 @@
action: shell hostname ${hostbase}`curl -s http://169.254.169.254/latest/meta-data/instance-id`
tags:
- config
-
-- name: put sysadmin-main in place for sshing in
- action: copy src=$files/common/sysadmin-main dest=/root/.ssh/authorized_keys mode=600 backup=true
+
+- name: add ansible root key
+ action: authorized_key user=root key='$FILE(${files}/common/ansible-pub-key)'
tags:
- config
-
-- name: add root keys for other allowed users
- action: authorized_key user=root key='$PIPE(${auth_keys_from_fas} ${root_auth_users})'
- only_if: is_set('${root_auth_users}')
+
+- name: add root keys for sysadmin-main and other allowed users
+ action: authorized_key user=root key='$PIPE(${auth_keys_from_fas} @sysadmin-main ${root_auth_users})'
tags:
- config
+
# note - kinda should be a handler - but handlers need args
- name: restorecon
action: command restorecon -R /root/.ssh