From dbf2fe00c9829078f82b7f025db7a8b61d0c9ff7 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Fri, 26 Oct 2018 18:28:28 +0000 Subject: [PATCH] role rewritten --- defaults/main.yaml | 3 ++ tasks/ansible.yaml | 2 +- tasks/{ara.yml => ara.yaml} | 6 ++-- tasks/cleanup.yaml | 29 +++++++++++++++++++ tasks/config.yaml | 11 +++++++ tasks/connection_plugin_lxc_ssh.yml | 14 --------- tasks/main.yaml | 18 ++++++++++++ tasks/main.yml | 23 --------------- tasks/mitogen.yaml | 11 +++++++ tasks/{ovh_module.yml => ovh_module.yaml} | 0 tasks/roles.yml | 1 - tasks/{setup_Debian.yml => setup_Debian.yaml} | 5 ---- templates/ansible.cfg.j2 | 9 +++++- 13 files changed, 84 insertions(+), 48 deletions(-) create mode 100644 defaults/main.yaml rename tasks/{ara.yml => ara.yaml} (60%) create mode 100644 tasks/cleanup.yaml create mode 100644 tasks/config.yaml delete mode 100644 tasks/connection_plugin_lxc_ssh.yml create mode 100644 tasks/main.yaml delete mode 100644 tasks/main.yml create mode 100644 tasks/mitogen.yaml rename tasks/{ovh_module.yml => ovh_module.yaml} (100%) delete mode 100644 tasks/roles.yml rename tasks/{setup_Debian.yml => setup_Debian.yaml} (82%) diff --git a/defaults/main.yaml b/defaults/main.yaml new file mode 100644 index 0000000..7c67ade --- /dev/null +++ b/defaults/main.yaml @@ -0,0 +1,3 @@ +ansible_use_ara: false +ansible_use_mitogen: true +ansible_with_ovh_module: true diff --git a/tasks/ansible.yaml b/tasks/ansible.yaml index c77f3f0..87c4ac4 100644 --- a/tasks/ansible.yaml +++ b/tasks/ansible.yaml @@ -1,6 +1,6 @@ --- -- name: install ansible via pip +- name: ansible pip package pip: name: ansible state: latest diff --git a/tasks/ara.yml b/tasks/ara.yaml similarity index 60% rename from tasks/ara.yml rename to tasks/ara.yaml index 0fa01e9..ca7ce76 100644 --- a/tasks/ara.yml +++ b/tasks/ara.yaml @@ -1,11 +1,11 @@ --- -- name: Install ARA with pip +- name: ara pip package pip: name: ara state: present -- name: Get ARA's installed location +- name: get ara location shell: python -c "import os,ara; print(os.path.dirname(ara.__file__))" - register: ara_location + register: _ara_location changed_when: false diff --git a/tasks/cleanup.yaml b/tasks/cleanup.yaml new file mode 100644 index 0000000..775d9e2 --- /dev/null +++ b/tasks/cleanup.yaml @@ -0,0 +1,29 @@ +--- + +- name: cleanup debian ansible package + apt: + pkg: ansible + state: absent + +- name: cleanup ansible lxc_ssh plugin + file: + path: /usr/share/ansible/plugins/connection/lxc_ssh + state: absent + +- name: cleanup ansible ovh module + file: + path: /usr/share/ansible/modules/ovh + state: absent + when: not ansible_with_ovh_module + +- name: cleanup ara pip package + pip: + name: ara + state: absent + when: not ansible_use_ara + +- name: cleanup mitogen pip package + pip: + name: mitogen + state: absent + when: not ansible_use_mitogen diff --git a/tasks/config.yaml b/tasks/config.yaml new file mode 100644 index 0000000..0c73c2e --- /dev/null +++ b/tasks/config.yaml @@ -0,0 +1,11 @@ +--- + +- name: ansible etc directory + file: + path: /etc/ansible + state: directory + +- name: ansible config + template: + src: ansible.cfg.j2 + dest: /etc/ansible/ansible.cfg diff --git a/tasks/connection_plugin_lxc_ssh.yml b/tasks/connection_plugin_lxc_ssh.yml deleted file mode 100644 index 7db31d7..0000000 --- a/tasks/connection_plugin_lxc_ssh.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- - -- name: connection plugin directory - file: - path: /usr/share/ansible/plugins/connection - state: directory - -- name: clone ansible-lxc-ssh - git: - #repo: https://github.com/chifflier/ansible-lxc-ssh.git # this wirks for ansible 2.2 with depecration warnings - #repo: https://github.com/andreasscherbaum/ansible-lxc-ssh.git # this wirks for ansible 2.2 without warnings but not for anisble 2.4 - repo: https://github.com/lgeorget/ansible-lxc-ssh.git # this works for ansible 2.4 - dest: /usr/share/ansible/plugins/connection/lxc_ssh - version: master diff --git a/tasks/main.yaml b/tasks/main.yaml new file mode 100644 index 0000000..886136c --- /dev/null +++ b/tasks/main.yaml @@ -0,0 +1,18 @@ +--- + +- include_tasks: setup_Debian.yaml + +- include_tasks: ansible.yaml + +- include_tasks: mitogen.yaml + when: ansible_use_mitogen + +- include_tasks: ara.yaml + when: ansible_use_ara + +- include_tasks: ovh_module.yaml + when: ansible_with_ovh_module + +- import_tasks: config.yaml + +- import_tasks: cleanup.yaml diff --git a/tasks/main.yml b/tasks/main.yml deleted file mode 100644 index 43d2662..0000000 --- a/tasks/main.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- include_tasks: setup_Debian.yml - -- include_tasks: ansible.yaml - - -- include_tasks: connection_plugin_lxc_ssh.yml -#- include_tasks: ara.yml - -- include_tasks: ovh_module.yml - -- name: ansible etc directory - file: - path: /etc/ansible - state: directory - -- name: ansible config - template: - src: ansible.cfg.j2 - dest: /etc/ansible/ansible.cfg - -- include_tasks: roles.yml diff --git a/tasks/mitogen.yaml b/tasks/mitogen.yaml new file mode 100644 index 0000000..1251362 --- /dev/null +++ b/tasks/mitogen.yaml @@ -0,0 +1,11 @@ +--- + +- name: mitogen pip package + pip: + name: mitogen + state: latest + +- name: get ansible_mitogen location + shell: python -c "import os,ansible_mitogen; print(os.path.dirname(ansible_mitogen.__file__))" + register: _ansible_mitogen_location + changed_when: false diff --git a/tasks/ovh_module.yml b/tasks/ovh_module.yaml similarity index 100% rename from tasks/ovh_module.yml rename to tasks/ovh_module.yaml diff --git a/tasks/roles.yml b/tasks/roles.yml deleted file mode 100644 index ed97d53..0000000 --- a/tasks/roles.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/tasks/setup_Debian.yml b/tasks/setup_Debian.yaml similarity index 82% rename from tasks/setup_Debian.yml rename to tasks/setup_Debian.yaml index f4b8028..2446a6b 100644 --- a/tasks/setup_Debian.yml +++ b/tasks/setup_Debian.yaml @@ -20,8 +20,3 @@ #- which - python-libcloud - python-netaddr - -- name: uninstall debian ansible module - apt: - pkg: ansible - state: absent diff --git a/templates/ansible.cfg.j2 b/templates/ansible.cfg.j2 index 1074708..79adb95 100644 --- a/templates/ansible.cfg.j2 +++ b/templates/ansible.cfg.j2 @@ -4,9 +4,16 @@ stdout_callback = yaml library = /usr/share/ansible/modules +{% if ansible_use_mitogen %} +strategy_plugins = {{ _ansible_mitogen_location.stdout }}/plugins/strategy +strategy = mitogen_linear +{% endif %} + retry_files_enabled = False -#callback_plugins = {#{{ ara_location.stdout }}#}/plugins/callbacks +{% if ansible_use_ara %} +callback_plugins = {{ _ara_location.stdout }}/plugins/callbacks +{% endif %} [ssh_connection] ssh_args = -o CheckHostIP=no -o StrictHostKeyChecking=yes