x
/
ironic-staging-drivers
Code Issues Proposed changes

Merge "Fix issue with /etc/hosts in ansible element"

This commit is contained in:
Jenkins 2017-01-11 13:26:31 +00:00 committed by Gerrit Code Review
parent a8edd3de65 841c18e7eb
commit aa31cbe8c8
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
imagebuild/ironic-ansible/element-deps
View File

@ -1,2 +1,3 @@
ironic-agent
devuser
openssh-server

1
imagebuild/ironic-ansible/package-installs.yaml
View File

@ -1 +0,0 @@
openssh-server:

8
imagebuild/ironic-ansible/post-install.d/81-ansible-ssh → imagebuild/ironic-ansible/post-install.d/81-ansible-host
View File

@ -20,10 +20,4 @@ echo $ANSIBLE_DEPLOY_HOSTAME > /etc/hostname
# Ansible issues #13965 (fixed in 2.0.1.0), #14568, #14714
# ensure /etc/hosts has hostname in it
sed -i "s/127.0.0.1\s*localhost/127.0.0.1 localhost $ANSIBLE_DEPLOY_HOSTAME/g" /etc/hosts
# ensure SSH host keys exist
ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa
ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa
ssh-keygen -f /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
ssh-keygen -f /etc/ssh/ssh_host_ed25519_key -N '' -t ed25519
echo "127.0.0.1 $ANSIBLE_DEPLOY_HOSTAME" >> /etc/hosts