Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds Support for Shell Type Instance Param to Delegated Driver #3932

Merged
merged 4 commits into from
Jun 12, 2023
Merged

Adds Support for Shell Type Instance Param to Delegated Driver #3932

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2272ec1
add parsing for shell type
Jun 9, 2023
7b783ec
fix a typo
Jun 9, 2023
58a3a2b
simplified ansible_connection_options method
Jun 9, 2023
b143f26
fix spelling issue
Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 19 additions & 18 deletions src/molecule/driver/delegated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class Delegated(Driver):
instance: instance_name
port: ssh_port_as_string
user: ssh_user
shell_type: sh
password: ssh_password # mutually exclusive with identity_file
become_method: valid_ansible_become_method # optional
become_pass: password_if_required # optional
Expand All @@ -64,6 +65,7 @@ class Delegated(Driver):
port: winrm_port_as_string
user: winrm_user
password: winrm_password
shell_type: powershell
winrm_transport: ntlm/credssp/kerberos
winrm_cert_pem: <path to the credssp public certificate key>
winrm_cert_key_pem: <path to the credssp private certificate key>
Expand Down Expand Up @@ -194,19 +196,30 @@ def login_options(self, instance_name):
return {"instance": instance_name}

def ansible_connection_options(self, instance_name):
# list of tuples describing mappable instance params and default values
instance_params = [
("become_pass", None),
("become_method", False),
("winrm_transport", None),
("winrm_cert_pem", None),
("winrm_cert_key_pem", None),
("winrm_server_cert_validation", None),
("shell_type", None),
("connection", "smart"),
]
if self.managed:
try:
d = self._get_instance_config(instance_name)
conn_dict = {}
# Check if optional mappable params are in the instance config
for i in instance_params:
if d.get(i[0], i[1]):
conn_dict["ansible_" + i[0]] = d.get(i[0])

conn_dict["ansible_user"] = d.get("user")
conn_dict["ansible_host"] = d.get("address")
conn_dict["ansible_port"] = d.get("port")
if d.get("connection", None):
conn_dict["ansible_connection"] = d.get("connection", "smart")
if d.get("become_method", False):
conn_dict["ansible_become_method"] = d.get("become_method")
if d.get("become_pass", None):
conn_dict["ansible_become_pass"] = d.get("become_pass")

if d.get("identity_file", None):
conn_dict["ansible_private_key_file"] = d.get("identity_file")
conn_dict["ansible_ssh_common_args"] = " ".join(
Expand All @@ -217,18 +230,6 @@ def ansible_connection_options(self, instance_name):
# Based on testinfra documentation, ansible password must be passed via ansible_ssh_pass
# issue to fix this can be found https://github.com/pytest-dev/pytest-testinfra/issues/580
conn_dict["ansible_ssh_pass"] = d.get("password")
if d.get("winrm_transport", None):
conn_dict["ansible_winrm_transport"] = d.get("winrm_transport")
if d.get("winrm_cert_pem", None):
conn_dict["ansible_winrm_cert_pem"] = d.get("winrm_cert_pem")
if d.get("winrm_cert_key_pem", None):
conn_dict["ansible_winrm_cert_key_pem"] = d.get(
"winrm_cert_key_pem",
)
if d.get("winrm_server_cert_validation", None):
conn_dict["ansible_winrm_server_cert_validation"] = d.get(
"winrm_server_cert_validation",
)

return conn_dict

Expand Down