Docker-common: Add missing variables declaration

Some variables are missing from ceph-docker-common role since the
include of check_mandatory_vars.yml has been re-added in the ceph-mon
role.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/1646/head
Guillaume Abrioux 2017-07-04 16:43:58 +02:00
parent 1c2d3a0b79
commit a951b7f957
4 changed files with 21 additions and 4 deletions

View File

@ -247,12 +247,14 @@ dummy:
## Monitor options ## Monitor options
# #
# You must define monitor_interface. # You must define either monitor_interface, monitor_address or monitor_address_block.
# You can also specify for each monitor which address the monitor will bind to in your **inventory host file** by using 'monitor_address' variable. # These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml).
# Preference will go to monitor_address if both are defined. # Eg. If you want to specify for each monitor which address the monitor will bind to you can set it in your **inventory host file** by using 'monitor_address' variable.
# Preference will go to monitor_address if both monitor_address and monitor_interface are defined.
# To use an IPv6 address, use the monitor_address setting instead (and set ip_version to ipv6) # To use an IPv6 address, use the monitor_address setting instead (and set ip_version to ipv6)
#monitor_interface: interface #monitor_interface: interface
#monitor_address: 0.0.0.0 #monitor_address: 0.0.0.0
#monitor_address_block: []
# set to either ipv4 or ipv6, whichever your network is using # set to either ipv4 or ipv6, whichever your network is using
#ip_version: ipv4 #ip_version: ipv4
#mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf #mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf
@ -421,6 +423,13 @@ dummy:
#ceph_conf_key_directory: /etc/ceph #ceph_conf_key_directory: /etc/ceph
###########
# Network #
###########
#monitor_interface: 'interface'
#monitor_address: '0.0.0.0'
#monitor_address_block: []
############ ############
# KV store # # KV store #
############ ############

View File

@ -246,6 +246,7 @@ rbd_client_admin_socket_path: /var/run/ceph # must be writable by QEMU and allow
# To use an IPv6 address, use the monitor_address setting instead (and set ip_version to ipv6) # To use an IPv6 address, use the monitor_address setting instead (and set ip_version to ipv6)
monitor_interface: interface monitor_interface: interface
monitor_address: 0.0.0.0 monitor_address: 0.0.0.0
monitor_address_block: []
# set to either ipv4 or ipv6, whichever your network is using # set to either ipv4 or ipv6, whichever your network is using
ip_version: ipv4 ip_version: ipv4
mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf

View File

@ -16,6 +16,13 @@ bootstrap_dirs_group: "64045"
ceph_conf_key_directory: /etc/ceph ceph_conf_key_directory: /etc/ceph
###########
# Network #
###########
monitor_interface: 'interface'
monitor_address: '0.0.0.0'
monitor_address_block: []
############ ############
# KV store # # KV store #
############ ############

View File

@ -5,4 +5,4 @@
when: when:
- monitor_interface == 'interface' - monitor_interface == 'interface'
- monitor_address == '0.0.0.0' - monitor_address == '0.0.0.0'
- not monitor_address_block - monitor_address_block | length == 0