Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't define mon_host if mon_host is overridden #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

don't define mon_host if mon_host is overridden #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2865435
don't define mon_host if mon_host is overridden
oddomatik Jan 3, 2020
b8494f9
increment version
oddomatik Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache v2.0'
description 'Installs/Configures Ceph (Jewel and above)'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '1.1.24'
version '1.1.25'

depends 'apache2', '>= 1.1.12'
depends 'apt'
Expand Down
2 changes: 1 addition & 1 deletion templates/default/ceph.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# to the cluster and public network options since they are all critical to every node.
# List of all of the monitor nodes in the given cluster
<% #Check ALL of the important vars before modifying them just in case their values are empty or nil. -%>
<% if !@mon_addresses.nil? && !@mon_addresses.empty? -%>
<% if !@mon_addresses.nil? && !@mon_addresses.empty? && !node['ceph']['config']['global']['mon_host'].nil? -%>
mon host = <%= @mon_addresses.sort.join(', ') %>
<% end -%>
# Suppress warning of too many pgs
Expand Down