openstack
/
tripleo-operator-ansible
Code Issues Proposed changes

Merge "Add --cluster to tripleo_ceph_deploy role"

This commit is contained in:
Zuul 2022-04-19 15:48:47 +00:00 committed by Gerrit Code Review
parent 9b63299bed 31394ed8f9
commit 93b1fa832c
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/tripleo_ceph_deploy/README.md
View File

@ -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.

1
roles/tripleo_ceph_deploy/defaults/main.yml
View File

@ -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:

2
roles/tripleo_ceph_deploy/tasks/main.yml
View File

@ -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 }}"