diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml index 48f85f198905cc38690f123ec86070d2e6758df6..297102d109639ef2cd00f4a2e8eaa06082e97ae6 100644 --- a/roles/ipaclient/tasks/install.yml +++ b/roles/ipaclient/tasks/install.yml @@ -7,6 +7,10 @@ state: present with_items: "{{ ipaclient_packages }}" +- name: Install - Include Python2/3 import test + include: "{{role_path}}/tasks/python_2_3_test.yml" + static: yes + - name: Install - IPA discovery ipadiscovery: domain: "{{ ipaclient_domain | default(omit) }}" diff --git a/roles/ipaclient/tasks/python_2_3_test.yml b/roles/ipaclient/tasks/python_2_3_test.yml new file mode 100644 index 0000000000000000000000000000000000000000..04270496c729975c0749961182f66401cb41cee7 --- /dev/null +++ b/roles/ipaclient/tasks/python_2_3_test.yml @@ -0,0 +1,15 @@ +- block: + - name: Verify Python3 import + command: python3 -c "from ipapython.version import NUM_VERSION" + register: py3test + failed_when: False + + - name: Set python interpreter to 3 + set_fact: + ansible_python_interpreter: "/usr/bin/python3" + when: py3test.rc == 0 + + - name: Set python interpreter to 2 + set_fact: + ansible_python_interpreter: "/usr/bin/python2" + when: py3test.failed or py3test.rc != 0 diff --git a/roles/ipaclient/tasks/uninstall.yml b/roles/ipaclient/tasks/uninstall.yml index acd0e5438018f9507e51b782af1c18d96dca089e..ba644158e4c4a9ef327c62d855746a483ed334a4 100644 --- a/roles/ipaclient/tasks/uninstall.yml +++ b/roles/ipaclient/tasks/uninstall.yml @@ -1,6 +1,10 @@ --- # tasks to uninstall IPA client +- name: Uninstall - Include Python2/3 import test + include: "{{role_path}}/tasks/python_2_3_test.yml" + static: yes + - name: Uninstall - Uninstall IPA client ipaclient: state: absent diff --git a/roles/ipaclient/vars/Fedora-25.yml b/roles/ipaclient/vars/Fedora-25.yml index 064ca8bfa34eafda240a62878c6b1093c25697b2..1a62ffa2f7d3edd5bcd8acacd5bd4c4a4fc3bddf 100644 --- a/roles/ipaclient/vars/Fedora-25.yml +++ b/roles/ipaclient/vars/Fedora-25.yml @@ -1,2 +1,2 @@ ipaclient_packages: [ "ipa-client", "libselinux-python" ] -ansible_python_interpreter: '/usr/bin/python2' \ No newline at end of file +#ansible_python_interpreter: '/usr/bin/python2' \ No newline at end of file diff --git a/roles/ipaclient/vars/Fedora-26.yml b/roles/ipaclient/vars/Fedora-26.yml index 064ca8bfa34eafda240a62878c6b1093c25697b2..1a62ffa2f7d3edd5bcd8acacd5bd4c4a4fc3bddf 100644 --- a/roles/ipaclient/vars/Fedora-26.yml +++ b/roles/ipaclient/vars/Fedora-26.yml @@ -1,2 +1,2 @@ ipaclient_packages: [ "ipa-client", "libselinux-python" ] -ansible_python_interpreter: '/usr/bin/python2' \ No newline at end of file +#ansible_python_interpreter: '/usr/bin/python2' \ No newline at end of file diff --git a/roles/ipaclient/vars/RedHat-7.3.yml b/roles/ipaclient/vars/RedHat-7.3.yml index 888aceaef36132f169b23ea4028e8534b20b4f3c..2501eab533a301879d15b3027768a4aaf262fcaa 100644 --- a/roles/ipaclient/vars/RedHat-7.3.yml +++ b/roles/ipaclient/vars/RedHat-7.3.yml @@ -1,4 +1,4 @@ # defaults file for ipaclient # vars/rhel.yml ipaclient_packages: [ "ipa-client", "ipa-admintools", "libselinux-python" ] -ansible_python_interpreter: '/usr/bin/python2' +#ansible_python_interpreter: '/usr/bin/python2' diff --git a/roles/ipaclient/vars/RedHat-7.yml b/roles/ipaclient/vars/RedHat-7.yml index 3f32a1bd8d8e641452a3fec91038972001543256..51ab7bfce86b6e0e81cfca4fb9d616936e18cd83 100644 --- a/roles/ipaclient/vars/RedHat-7.yml +++ b/roles/ipaclient/vars/RedHat-7.yml @@ -1,4 +1,4 @@ # defaults file for ipaclient # vars/rhel.yml ipaclient_packages: [ "ipa-client", "libselinux-python" ] -ansible_python_interpreter: '/usr/bin/python2' +#ansible_python_interpreter: '/usr/bin/python2' diff --git a/roles/ipaclient/vars/default.yml b/roles/ipaclient/vars/default.yml index 81c13a98823d775e0be9b65a8903b862e39d7051..54c64d1cbb349650b70a9e51a4bd5274b2e87166 100644 --- a/roles/ipaclient/vars/default.yml +++ b/roles/ipaclient/vars/default.yml @@ -1,4 +1,4 @@ # defaults file for ipaclient # vars/default.yml ipaclient_packages: [ "ipa-client", "libselinux-python" ] -ansible_python_interpreter: '/usr/bin/python3' +#ansible_python_interpreter: '/usr/bin/python3'