airship
/
hostconfig-operator
Code Issues Proposed changes

Fix ansible ssh authentication 

Closes #15

Change-Id: I570618a7990492929972854e35a0d6070a90ccd6
This commit is contained in:
Pallav Gupta 2021-08-18 08:46:12 -07:00
parent 5013bfc23b
commit 83cb9239ee
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -105,7 +105,7 @@ ssh-keygen -q -t rsa -N '' -f <key_file_name>
ssh-copy-id -i <key_file_name> <username>@<node_ip>
kubectl create secret generic <secret_name> \
--from-literal=username=<username> \
--from-file=ssh_private_key=<key_file_name>
--from-file=ssh-privatekey=<key_file_name>
kubectl annotate node <node_name> secret=<secret_name>
```

6
airship-host-config/inventory/dynamic_inventory.py
View File

@ -68,7 +68,7 @@ class KubeInventory(object):
username = (base64.b64decode(
secret_value.data['username'])).decode("utf-8")
self.inventory["_meta"]["hostvars"]\
[node_internalip]["ansible_ssh_user"] = username
[node_internalip]["ansible_ssh_user"] = username.strip()
elif "USER" in os.environ:
self.inventory["_meta"]["hostvars"][node_internalip]\
["ansible_ssh_user"] = os.environ.get("USER")
@ -80,9 +80,9 @@ class KubeInventory(object):
secret_value.data['password'])).decode("utf-8")
self.inventory["_meta"]["hostvars"]\
[node_internalip]["ansible_ssh_pass"] = password
elif "ssh_private_key" in secret_value.data.keys():
elif "ssh-privatekey" in secret_value.data.keys():
private_key = (base64.b64decode(
secret_value.data['ssh_private_key'])).decode("utf-8")
secret_value.data['ssh-privatekey'])).decode("utf-8")
fileName = "/opt/ansible/.ssh/"+node_name
with open(os.open(
fileName, os.O_CREAT | os.O_WRONLY, 0o644), 'w') as f:

2
tools/deployment/20_configure_ssh_on_nodes.sh
View File

@ -36,6 +36,6 @@ do
printf 'Working on host %s with Indexs and having IP %s\n' "${hosts[i]}" "$i" "${hosts_ips[i]}"
ssh-keygen -q -t rsa -N '' -f ssh/${hosts[i]}
sshpass -p $PASSWORD ssh-copy-id -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ssh/${hosts[i]} $USERNAME@${hosts_ips[i]}
kubectl create secret generic ${hosts[i]} --from-literal=username=$USERNAME --from-file=ssh_private_key=ssh/${hosts[i]}
kubectl create secret generic ${hosts[i]} --from-literal=username=$USERNAME --from-file=ssh-privatekey=ssh/${hosts[i]}
kubectl annotate node ${hosts[i]} secret=${hosts[i]}
done

2
tools/install_ssh_private_key.sh
View File

@ -11,7 +11,7 @@ if [[ $1 ]] && [[ $2 ]]; then
printf 'Working on host %s with Index %s and having IP %s\n' "${hosts[i]}" "$i" "${hosts_ips[i]}"
ssh-keygen -q -t rsa -N '' -f ${hosts[i]}
sshpass -p $PASSWORD ssh-copy-id -o StrictHostKeyChecking=no -i ${hosts[i]} $USERNAME@${hosts_ips[i]}
kubectl create secret generic ${hosts[i]} --from-literal=username=$USERNAME --from-file=ssh_private_key=${hosts[i]}
kubectl create secret generic ${hosts[i]} --from-literal=username=$USERNAME --from-file=ssh-privatekey=${hosts[i]}
kubectl annotate node ${hosts[i]} secret=${hosts[i]}
done
else