cobbler: Install ansible from PyPI

The distros we're using don't ship ansible 2.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
index 50fcfe2083abfcb31c2a971cf5e6ad7961795616..8af4005e4a20cd5a157de0608bfb28733c1cb6e2 100644 (file)
--- 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 a1547783220f379b0ae4bd685620d372da41e681..4e05169902413433e038840a3af00e55faa9cf8a 100644 (file)
--- 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 559b48e4c944ecb218a4962a1c424ef6d06f6f58..9d05c83f539387fd9e871035f2d88f53d8f98279 100644 (file)
--- 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 12a9c85b0aabbfc6003b592d7eabcbdb332dd6b9..7bbd6c2ce0e3707b48d1aa72ffa846915ed149cc 100644 (file)
--- 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