diff --git a/inventory/inventory.sh b/inventory/inventory.sh index 3c506b1..60750b6 100755 --- a/inventory/inventory.sh +++ b/inventory/inventory.sh @@ -115,17 +115,16 @@ all: IFS=',' read -ra IPS <<< "$IP_LIST" for IP in "${IPS[@]}"; do inventory_content+=" ${IP}: - ansible_user: ${WINDOWS_USER} - ansible_password: '${ANSIBLE_PASSWORD}' ansible_host: ${IP} - ansible_connection: winrm - ansible_winrm_server_cert_validation: ignore " done inventory_content+=" vars: - ansible_connection: ssh - ansible_ssh_private_key_file: /var/jenkins_home/jenkins_key + ansible_user: ${WINDOWS_USER} + ansible_password: '${ANSIBLE_PASSWORD}' + ansible_connection: winrm + ansible_winrm_server_cert_validation: ignore + winrm_transport = ntlm ansible_python_interpreter: /usr/bin/python3 jenkins_user: '${JENKINS_USER}' jenkins_group: '${JENKINS_GROUP}' diff --git a/jenkins/Jenkinsfile.test b/jenkins/Jenkinsfile.test index f73b85b..c527547 100644 --- a/jenkins/Jenkinsfile.test +++ b/jenkins/Jenkinsfile.test @@ -53,7 +53,7 @@ pipeline { cd /var/jenkins_home/ansible-windows echo ansible-playbook -i \$inventory_file \$playbook_file \ - --ssh-common-args='-o StrictHostKeyChecking=no' " + --ssh-common-args='-o StrictHostKeyChecking=no' """ } }