openstack
/
python-tripleoclient
Code Issues Proposed changes

Skip CephIngress daemon deploy 

This patch just adds an argument to the existing tripleo ceph cli
to skip the ingress deployment. This option is helpful for both
standalone environments, where now mds and nfs can be deployed before
the overcloud deployment phase, but also for CI where a flat network
is used.

Change-Id: Ida1429f237ec9d85c007c757581ee57a49ac3808
This commit is contained in:
Francesco Pantano 2022-08-09 11:07:38 +02:00
parent 2885c65257
commit a28cbdcb58
No known key found for this signature in database
GPG Key ID: 0458D4D1F41BD75C
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/tests/v2/overcloud_ceph/test_overcloud_ceph.py
View File

@ -71,6 +71,7 @@ class TestOvercloudCephDeploy(fakes.FakePlaybookExecution):
"tripleo_cephadm_standalone": False,
'tripleo_cephadm_ssh_user': 'jimmy',
'tripleo_cephadm_cluster': 'ceph',
'tripleo_cephadm_ingress': True,
'tripleo_cephadm_first_mon_ip': '127.0.0.1',
'tripleo_roles_path': mock.ANY,
'tripleo_cephadm_container_ns': 'quay.io/ceph',
@ -119,6 +120,7 @@ class TestOvercloudCephDeploy(fakes.FakePlaybookExecution):
'tripleo_cephadm_first_mon_ip': '127.0.0.1',
'tripleo_cephadm_cluster': 'ceph',
'dynamic_ceph_spec': False,
'tripleo_cephadm_ingress': True,
'ceph_spec_path': mock.ANY,
'tripleo_cephadm_container_ns': 'quay.io/ceph',
'tripleo_cephadm_container_image': 'ceph',

3
tripleoclient/v2/overcloud_ceph.py
View File

@ -356,6 +356,7 @@ class OvercloudCephDeploy(command.Command):
output_path = os.path.abspath(parsed_args.output)
overwrite = parsed_args.yes
ceph_ingress = True
if (os.path.exists(output_path) and not overwrite
and not oooutils.prompt_user_for_confirmation(
'Overwrite existing file %s [y/N]?' % parsed_args.output,
@ -376,6 +377,7 @@ class OvercloudCephDeploy(command.Command):
if parsed_args.standalone:
inventory = oooutils.standalone_ceph_inventory(working_dir)
ceph_ingress = False
else:
inventory = os.path.join(working_dir,
constants.TRIPLEO_STATIC_INVENTORY)
@ -392,6 +394,7 @@ class OvercloudCephDeploy(command.Command):
"working_dir": working_dir,
"stack_name": parsed_args.stack,
"tripleo_cephadm_standalone": parsed_args.standalone,
"tripleo_cephadm_ingress": ceph_ingress,
"tripleo_ceph_client_vars": os.path.join(working_dir,
'ceph_client.yml')
}