ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cephadm: set allow_overwrite at bootstrap step 

Signed-off-by: yasinlachiny <yasin.lachiny@gmail.com>
(cherry picked from commit 2a28758472)
pull/7091/head
yasinlachiny 2021-12-18 02:32:32 +03:30 committed by Guillaume Abrioux
parent df0901e879
commit 678b868e92
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/cephadm_bootstrap.py
View File

@ -81,6 +81,11 @@ options:
- Manage firewall rules with firewalld. - Manage firewall rules with firewalld.
required: false required: false
default: true default: true
allow_overwrite:
description:
- allow overwrite of existing –output-* config/keyring/ssh files.
required: false
default: false
registry_url: registry_url:
description: description:
- URL for custom registry. - URL for custom registry.
@ -100,11 +105,11 @@ options:
required: false required: false
ssh_user: ssh_user:
description: description:
- SSH user used for cephadm ssh to the hosts - SSH user used for cephadm ssh to the hosts.
required: false required: false
ssh_config: ssh_config:
description: description:
- SSH config file path for cephadm ssh client - SSH config file path for cephadm ssh client.
required: false required: false
author: author:
- Dimitri Savineau <dsavinea@redhat.com> - Dimitri Savineau <dsavinea@redhat.com>
@ -147,6 +152,7 @@ def main():
dashboard_password=dict(type='str', required=False, no_log=True), dashboard_password=dict(type='str', required=False, no_log=True),
monitoring=dict(type='bool', required=False, default=True), monitoring=dict(type='bool', required=False, default=True),
firewalld=dict(type='bool', required=False, default=True), firewalld=dict(type='bool', required=False, default=True),
allow_overwrite=dict(type='bool', required=False, default=False),
registry_url=dict(type='str', require=False), registry_url=dict(type='str', require=False),
registry_username=dict(type='str', require=False), registry_username=dict(type='str', require=False),
registry_password=dict(type='str', require=False, no_log=True), registry_password=dict(type='str', require=False, no_log=True),
@ -175,6 +181,7 @@ def main():
dashboard_password = module.params.get('dashboard_password') dashboard_password = module.params.get('dashboard_password')
monitoring = module.params.get('monitoring') monitoring = module.params.get('monitoring')
firewalld = module.params.get('firewalld') firewalld = module.params.get('firewalld')
allow_overwrite = module.params.get('allow_overwrite')
registry_url = module.params.get('registry_url') registry_url = module.params.get('registry_url')
registry_username = module.params.get('registry_username') registry_username = module.params.get('registry_username')
registry_password = module.params.get('registry_password') registry_password = module.params.get('registry_password')
@ -214,6 +221,9 @@ def main():
if not firewalld: if not firewalld:
cmd.append('--skip-firewalld') cmd.append('--skip-firewalld')
if allow_overwrite:
cmd.append('--allow-overwrite')
if registry_url and registry_username and registry_password: if registry_url and registry_username and registry_password:
cmd.extend(['--registry-url', registry_url, cmd.extend(['--registry-url', registry_url,
'--registry-username', registry_username, '--registry-username', registry_username,