]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ansible: install distro-provided jq
authorDavid Galloway <dgallowa@redhat.com>
Tue, 31 Oct 2017 16:37:25 +0000 (12:37 -0400)
committerDavid Galloway <dgallowa@redhat.com>
Mon, 6 Nov 2017 15:34:12 +0000 (10:34 -0500)
Signed-off-by: David Galloway <dgallowa@redhat.com>
ansible/examples/slave.yml
ansible/examples/slave_static.yml
ansible/slave.yml

index 4ac14f5bd6a83640319e845c50d71fcff1858ad7..39af74fbe715ea4535e55e08e624e492ce10ede2 100644 (file)
         - libffi-devel
       when: ansible_pkg_mgr  == "yum"
 
+    - name: install packages from epel
+      yum:
+        name: jq
+        state: present
+        enablerepo: epel
+        update_cache: yes
+      when: ansible_os_family == "RedHat"
+
     # Run the equivalent of "apt-get update" as a separate step
     - apt:
         update_cache: yes
         - debian-archive-keyring
         # jenkins-job-builder job:
         - libyaml-dev
+        - jq
         # ceph-docs job:
         - doxygen
         - ditaa
index 46f7fd2489eb043c08ee5f40e2bc569c8623e39f..bebac4185e4e7ce9e98168f085090209dce551f9 100644 (file)
         - libffi-devel
       when: ansible_pkg_mgr  == "yum"
 
+    - name: install packages from epel
+      yum:
+        name: jq
+        state: present
+        enablerepo: epel
+        update_cache: yes
+      when: ansible_os_family == "RedHat"
+
     # Run the equivalent of "apt-get update" as a separate step
     - apt: update_cache=yes
       when: ansible_pkg_mgr  == "apt"
         - debian-archive-keyring
         # jenkins-job-builder job:
         - libyaml-dev
+        - jq
         # ceph-docs job:
         - doxygen
         - ditaa
index 4ac14f5bd6a83640319e845c50d71fcff1858ad7..39af74fbe715ea4535e55e08e624e492ce10ede2 100644 (file)
         - libffi-devel
       when: ansible_pkg_mgr  == "yum"
 
+    - name: install packages from epel
+      yum:
+        name: jq
+        state: present
+        enablerepo: epel
+        update_cache: yes
+      when: ansible_os_family == "RedHat"
+
     # Run the equivalent of "apt-get update" as a separate step
     - apt:
         update_cache: yes
         - debian-archive-keyring
         # jenkins-job-builder job:
         - libyaml-dev
+        - jq
         # ceph-docs job:
         - doxygen
         - ditaa