From 5927df7962b9aac0155bff4629ea02b6644fe7f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 14 Apr 2015 12:53:41 +0200 Subject: [PATCH] Add ceph-common role to client machines MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add another warning for cephx signatures Signed-off-by: Sébastien Han --- Vagrantfile | 9 +++++---- roles/ceph-common/defaults/main.yml | 2 +- site.yml | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 22bedba9d..064601ac9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -21,10 +21,11 @@ ansible_provision = proc do |ansible| # these aren't supported by Vagrant, see # https://github.com/mitchellh/vagrant/issues/3539 ansible.groups = { - 'mons' => (0..NMONS - 1).map { |j| "mon#{j}" }, - 'osds' => (0..NOSDS - 1).map { |j| "osd#{j}" }, - 'mdss' => (0..NMDSS - 1).map { |j| "mds#{j}" }, - 'rgws' => (0..NRGWS - 1).map { |j| "rgw#{j}" } + 'mons' => (0..NMONS - 1).map { |j| "mon#{j}" }, + 'osds' => (0..NOSDS - 1).map { |j| "osd#{j}" }, + 'mdss' => (0..NMDSS - 1).map { |j| "mds#{j}" }, + 'rgws' => (0..NRGWS - 1).map { |j| "rgw#{j}" }, + 'clients' => (0..CLIENTS - 1).map { |j| "client#{j}" } } # In a production deployment, these should be secret diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index 1b297919c..b5d25afbf 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -51,7 +51,7 @@ ceph_dev_redhat_distro: centos7 # fsid: "{{ cluster_uuid.stdout }}" cephx: true -cephx_require_signatures: true # Kernel RBD does NOT support signatures! +cephx_require_signatures: true # Kernel RBD does NOT support signatures for Kernels < 3.18! cephx_cluster_require_signatures: true cephx_service_require_signatures: false max_open_files: 131072 diff --git a/site.yml b/site.yml index 72704be59..2579dafcc 100644 --- a/site.yml +++ b/site.yml @@ -6,6 +6,7 @@ - osds - mdss - rgws + - clients # Kernel RBD does NOT support signatures for Kernels < 3.18! Make sure to set cephx_require_signatures: false sudo: True roles: - { role: ceph-common, when: not docker } -- 2.39.5