From a09ce92d513428e749fd037b260563e7530ca1ef Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 6 Jun 2017 16:46:44 +0200 Subject: [PATCH] Common: Add a default for ceph_docker_on_openstack Add a default value for `ceph_docker_on_openstack` to avoid a conditional check error for the task `pause after docker install before starting` in `roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml` Signed-off-by: Guillaume Abrioux --- group_vars/all.yml.sample | 2 ++ roles/ceph-docker-common/defaults/main.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 39c84a285..cc6fd4a12 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -409,6 +409,8 @@ dummy: #ceph_docker_registry: docker.io #ceph_docker_enable_centos_extra_repo: false +#ceph_docker_on_openstack: false + #mon_use_fqdn: false # if set to true, the MON name used will be the fqdn # Set uid/gid to default '64045' for bootstrap directories. diff --git a/roles/ceph-docker-common/defaults/main.yml b/roles/ceph-docker-common/defaults/main.yml index 0b88fa8a3..f9f5a8a05 100644 --- a/roles/ceph-docker-common/defaults/main.yml +++ b/roles/ceph-docker-common/defaults/main.yml @@ -4,6 +4,8 @@ generate_fsid: true ceph_docker_registry: docker.io ceph_docker_enable_centos_extra_repo: false +ceph_docker_on_openstack: false + mon_use_fqdn: false # if set to true, the MON name used will be the fqdn # Set uid/gid to default '64045' for bootstrap directories.