Merge branch 'master' of /git/ansible

This commit is contained in:
Kevin Fenzi 2015-01-27 16:59:36 +00:00
commit cfd6afc925

View file

@ -132,8 +132,9 @@
- lineinfile:
dest=/usr/lib/python2.7/site-packages/packstack/plugins/dashboard_500.py
regexp=" host_resources.append(ssl_key, 'ssl_ps_server.key')"
regexp=" host_resources\.append\(ssl_key, 'ssl_ps_server.key'\)"
line=" host_resources.append((ssl_key, 'ssl_ps_server.key'))"
backup=yes
# 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') }}"