From: Zack Cerza <zack@redhat.com>
Date: Thu, 16 Jul 2015 16:01:23 +0000 (-0600)
Subject: Install the Core and Base groups on rpm systems
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F82%2Fhead;p=ceph-cm-ansible.git

Install the Core and Base groups on rpm systems

We need to make sure basic things like bzip2 are installed.

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

diff --git a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
index 4f7728b5..5d79e62c 100644
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
@@ -45,6 +45,8 @@ $SNIPPET('pre_anamon')
 %end
 
 %packages
+@core
+@base
 $SNIPPET('cephlab_packages_rhel')
 $SNIPPET('func_install_if_enabled')
 %end
diff --git a/roles/testnode/vars/centos_6.yml b/roles/testnode/vars/centos_6.yml
index 6834393c..a10d2bbf 100644
--- a/roles/testnode/vars/centos_6.yml
+++ b/roles/testnode/vars/centos_6.yml
@@ -40,6 +40,8 @@ yum_repos:
     priority: 2
 
 packages:
+  - '@core'
+  - '@base'
   - yum-plugin-priorities
   - redhat-lsb
   - sysstat
diff --git a/roles/testnode/vars/centos_7.yml b/roles/testnode/vars/centos_7.yml
index ea8a2b29..ea23ac32 100644
--- a/roles/testnode/vars/centos_7.yml
+++ b/roles/testnode/vars/centos_7.yml
@@ -16,6 +16,8 @@ yum_repos:
     priority: 2
 
 packages:
+  - '@core'
+  - '@base'
   - yum-plugin-priorities
   - redhat-lsb
   - sysstat
diff --git a/roles/testnode/vars/fedora_20.yml b/roles/testnode/vars/fedora_20.yml
index 657eff29..4e577729 100644
--- a/roles/testnode/vars/fedora_20.yml
+++ b/roles/testnode/vars/fedora_20.yml
@@ -17,6 +17,8 @@ packages_to_remove:
   - ceph-libs
 
 packages:
+  - '@core'
+  - '@base'
   - yum-plugin-priorities
   - redhat-lsb
   - sysstat
diff --git a/roles/testnode/vars/redhat_6.yml b/roles/testnode/vars/redhat_6.yml
index 8734e564..c743e880 100644
--- a/roles/testnode/vars/redhat_6.yml
+++ b/roles/testnode/vars/redhat_6.yml
@@ -34,6 +34,8 @@ common_yum_repos:
     priority: 2
 
 packages:
+  - '@core'
+  - '@base'
   - yum-plugin-priorities
   - redhat-lsb
   - sysstat
diff --git a/roles/testnode/vars/redhat_7.yml b/roles/testnode/vars/redhat_7.yml
index 2254d212..4441ea28 100644
--- a/roles/testnode/vars/redhat_7.yml
+++ b/roles/testnode/vars/redhat_7.yml
@@ -16,6 +16,8 @@ common_yum_repos:
     priority: 2
 
 packages:
+  - '@core'
+  - '@base'
   - yum-plugin-priorities
   - redhat-lsb
   - sysstat