diff --git a/roles/tripleo_ceph_deploy/README.md b/roles/tripleo_ceph_deploy/README.md
index 566adae..e4594b9 100644
--- a/roles/tripleo_ceph_deploy/README.md
+++ b/roles/tripleo_ceph_deploy/README.md
@@ -12,6 +12,7 @@ Role Variables
 --------------
 
 * `tripleo_ceph_deploy_become`: (Boolean) Execute command with escalated privileges. Default: false
+* `tripleo_ceph_deploy_cluster`: (String) Name of the Ceph cluster. If set to 'foo', then the files /etc/ceph/<FSID>/foo.conf and /etc/ceph/<FSID>/foo.client.admin.keyring will be created. Otherwise these files will use the name 'ceph'. Changing this means changing command line calls too, e.g. 'ceph health' will become 'ceph --cluster foo health' unless export CEPH_ARGS='--cluster foo' is used. If unset `openenstack overcloud ceph deploy` will default this value to 'ceph'.
 * `tripleo_ceph_deploy_crush_hierarchy`: (String) Path to an existing crush hierarchy spec file.
 * `tripleo_ceph_deploy_debug`: (Boolean) Flag to print out the command that is run. Default: false
 * `tripleo_ceph_deploy_deployed_baremetal`: (String) Path to the environment file output from "openstack overcloud node provision". This argument may be excluded only if tripleo_ceph_deploy_standalone is True.
diff --git a/roles/tripleo_ceph_deploy/defaults/main.yml b/roles/tripleo_ceph_deploy/defaults/main.yml
index 2595217..ad57604 100644
--- a/roles/tripleo_ceph_deploy/defaults/main.yml
+++ b/roles/tripleo_ceph_deploy/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 openstack_bin: openstack
 tripleo_ceph_deploy_become: false
+tripleo_ceph_deploy_cluster:
 tripleo_ceph_deploy_crush_hierarchy:
 tripleo_ceph_deploy_debug: false
 tripleo_ceph_deploy_deployed_baremetal:
diff --git a/roles/tripleo_ceph_deploy/tasks/main.yml b/roles/tripleo_ceph_deploy/tasks/main.yml
index b93792d..9e72b4b 100644
--- a/roles/tripleo_ceph_deploy/tasks/main.yml
+++ b/roles/tripleo_ceph_deploy/tasks/main.yml
@@ -8,6 +8,7 @@
       {{ tripleo_ceph_deploy_overwrite | ternary('--yes', '') }}
       {{ tripleo_ceph_deploy_standalone | ternary('--standalone', '') }}
       {{ tripleo_ceph_deploy_mon_ip | ternary('--mon-ip $CEPH_MON_IP', '') }}
+      {{ tripleo_ceph_deploy_cluster | ternary('--cluster $CLUSTER', '') }}
       {{ tripleo_ceph_deploy_spec | ternary('--ceph-spec $CEPH_SPEC', '') }}
       {{ tripleo_ceph_deploy_stack | ternary('--stack $DEPLOY_STACK', '') }}
       {{ tripleo_ceph_deploy_working_dir | ternary('--working-dir $DEPLOY_WORKING_DIR', '') }}
@@ -42,6 +43,7 @@
       DEPLOY_ROLES_FILE: "{{ tripleo_ceph_deploy_roles_file }}"
       CEPH_SPEC: "{{ tripleo_ceph_deploy_spec }}"
       CEPH_MON_IP: "{{ tripleo_ceph_deploy_mon_ip }}"
+      CLUSTER: "{{ tripleo_ceph_deploy_cluster }}"
       CEPH_OSD_SPEC: "{{ tripleo_ceph_deploy_osd_spec }}"
       CEPH_CRUSH_HIERARCHY: "{{ tripleo_ceph_deploy_crush_hierarchy }}"
       CEPHADM_SSH_USER: "{{ tripleo_ceph_user_ssh_user }}"