From e4a7a19723305389b723108ecbd0c85df04bc838 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 18 Feb 2016 10:31:52 -0700 Subject: [PATCH] cobbler: Install ansible from PyPI The distros we're using don't ship ansible 2. Signed-off-by: Zack Cerza --- roles/cobbler/defaults/main.yml | 4 ++++ roles/cobbler/tasks/main.yml | 6 +++++- roles/cobbler/vars/apt_systems.yml | 2 +- roles/cobbler/vars/yum_systems.yml | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml index 50fcfe20..8af4005e 100644 --- a/roles/cobbler/defaults/main.yml +++ b/roles/cobbler/defaults/main.yml @@ -70,3 +70,7 @@ power_type: ipmilan # repo to be useful power_user: poweruser power_pass: powerpass + +pip_packages: + - pip + - ansible diff --git a/roles/cobbler/tasks/main.yml b/roles/cobbler/tasks/main.yml index a1547783..4e051699 100644 --- a/roles/cobbler/tasks/main.yml +++ b/roles/cobbler/tasks/main.yml @@ -20,7 +20,7 @@ content: "{{ item.data }}" dest: "{{ item.path }}" mode: '600' - with_items: cobbler_keys["{{ ansible_hostname}}"] + with_items: cobbler_keys["{{ ansible_hostname }}"] no_log: true - name: Include package type specific vars. @@ -34,6 +34,10 @@ - include: apt_systems.yml when: ansible_pkg_mgr == "apt" +- include: pip.yml + tags: + - pip + - name: Start cobbler service: name: "{{ cobbler_service }}" diff --git a/roles/cobbler/vars/apt_systems.yml b/roles/cobbler/vars/apt_systems.yml index 559b48e4..9d05c83f 100644 --- a/roles/cobbler/vars/apt_systems.yml +++ b/roles/cobbler/vars/apt_systems.yml @@ -7,5 +7,5 @@ cobbler_extra_packages: - syslinux - python-pykickstart - fence-agents - - ansible - nmap + - python-pip diff --git a/roles/cobbler/vars/yum_systems.yml b/roles/cobbler/vars/yum_systems.yml index 12a9c85b..7bbd6c2c 100644 --- a/roles/cobbler/vars/yum_systems.yml +++ b/roles/cobbler/vars/yum_systems.yml @@ -8,5 +8,6 @@ cobbler_extra_packages: - syslinux - pykickstart - fence-agents-all - - ansible - nmap + - python-pip + - python2-crypto -- 2.47.3