Merge pull request #839 from dcwangmit01/centos_remove_plugin_priorities

Remove Centos7 dependency yum-plugin-priorities
pull/846/head
Leseb 2016-06-06 13:41:15 +02:00
commit 98b4153e62
2 changed files with 16 additions and 4 deletions

View File

@ -53,7 +53,6 @@ dummy:
#centos_package_dependencies: #centos_package_dependencies:
# - python-pycurl # - python-pycurl
# - hdparm # - hdparm
# - yum-plugin-priorities.noarch
# - epel-release # - epel-release
# - ntp # - ntp
# - python-setuptools # - python-setuptools
@ -340,3 +339,17 @@ dummy:
#mon_containerized_deployment_with_kv: false #mon_containerized_deployment_with_kv: false
##################
# Temporary Vars #
##################
# NOTE(SamYaple): These vars are set here to they are defined before use. They
# should be removed after a refactor has properly seperated all the checks into
# the appropriate roles.
#journal_collocation: False
#raw_multi_journal: False
#osd_directory: False
#bluestore: False
#osd_auto_discovery: False

View File

@ -45,7 +45,6 @@ debian_package_dependencies:
centos_package_dependencies: centos_package_dependencies:
- python-pycurl - python-pycurl
- hdparm - hdparm
- yum-plugin-priorities.noarch
- epel-release - epel-release
- ntp - ntp
- python-setuptools - python-setuptools
@ -124,7 +123,7 @@ ceph_stable_ice_kmod: 3.10-0.1.20140702gitdc9ac62.el7.x86_64
#ceph_stable_ice_password: # htaccess password #ceph_stable_ice_password: # htaccess password
# ENTERPRISE VERSION RED HAT STORAGE (from 1.3) # ENTERPRISE VERSION RED HAT STORAGE (from 1.3)
# This version is only supported on RHEL 7.1 # This version is only supported on RHEL >= 7.1
# As of RHEL 7.1, libceph.ko and rbd.ko are now included in Red Hat's kernel # As of RHEL 7.1, libceph.ko and rbd.ko are now included in Red Hat's kernel
# packages natively. The RHEL 7.1 kernel packages are more stable and secure than # packages natively. The RHEL 7.1 kernel packages are more stable and secure than
# using these 3rd-party kmods with RHEL 7.0. Please update your systems to RHEL # using these 3rd-party kmods with RHEL 7.0. Please update your systems to RHEL
@ -235,7 +234,7 @@ mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the
## OSD options ## OSD options
# #
journal_size: 0 journal_size: 0 # OSD journal size in MB
public_network: 0.0.0.0/0 public_network: 0.0.0.0/0
cluster_network: "{{ public_network }}" cluster_network: "{{ public_network }}"
osd_mkfs_type: xfs osd_mkfs_type: xfs