Merge "Skip CephIngress daemon deploy"
This commit is contained in:
commit
2bd755822f
tripleoclient
@ -71,6 +71,7 @@ class TestOvercloudCephDeploy(fakes.FakePlaybookExecution):
|
|||||||
"tripleo_cephadm_standalone": False,
|
"tripleo_cephadm_standalone": False,
|
||||||
'tripleo_cephadm_ssh_user': 'jimmy',
|
'tripleo_cephadm_ssh_user': 'jimmy',
|
||||||
'tripleo_cephadm_cluster': 'ceph',
|
'tripleo_cephadm_cluster': 'ceph',
|
||||||
|
'tripleo_cephadm_ingress': True,
|
||||||
'tripleo_cephadm_first_mon_ip': '127.0.0.1',
|
'tripleo_cephadm_first_mon_ip': '127.0.0.1',
|
||||||
'tripleo_roles_path': mock.ANY,
|
'tripleo_roles_path': mock.ANY,
|
||||||
'tripleo_cephadm_container_ns': 'quay.io/ceph',
|
'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_first_mon_ip': '127.0.0.1',
|
||||||
'tripleo_cephadm_cluster': 'ceph',
|
'tripleo_cephadm_cluster': 'ceph',
|
||||||
'dynamic_ceph_spec': False,
|
'dynamic_ceph_spec': False,
|
||||||
|
'tripleo_cephadm_ingress': True,
|
||||||
'ceph_spec_path': mock.ANY,
|
'ceph_spec_path': mock.ANY,
|
||||||
'tripleo_cephadm_container_ns': 'quay.io/ceph',
|
'tripleo_cephadm_container_ns': 'quay.io/ceph',
|
||||||
'tripleo_cephadm_container_image': 'ceph',
|
'tripleo_cephadm_container_image': 'ceph',
|
||||||
|
@ -356,6 +356,7 @@ class OvercloudCephDeploy(command.Command):
|
|||||||
|
|
||||||
output_path = os.path.abspath(parsed_args.output)
|
output_path = os.path.abspath(parsed_args.output)
|
||||||
overwrite = parsed_args.yes
|
overwrite = parsed_args.yes
|
||||||
|
ceph_ingress = True
|
||||||
if (os.path.exists(output_path) and not overwrite
|
if (os.path.exists(output_path) and not overwrite
|
||||||
and not oooutils.prompt_user_for_confirmation(
|
and not oooutils.prompt_user_for_confirmation(
|
||||||
'Overwrite existing file %s [y/N]?' % parsed_args.output,
|
'Overwrite existing file %s [y/N]?' % parsed_args.output,
|
||||||
@ -376,6 +377,7 @@ class OvercloudCephDeploy(command.Command):
|
|||||||
|
|
||||||
if parsed_args.standalone:
|
if parsed_args.standalone:
|
||||||
inventory = oooutils.standalone_ceph_inventory(working_dir)
|
inventory = oooutils.standalone_ceph_inventory(working_dir)
|
||||||
|
ceph_ingress = False
|
||||||
else:
|
else:
|
||||||
inventory = os.path.join(working_dir,
|
inventory = os.path.join(working_dir,
|
||||||
constants.TRIPLEO_STATIC_INVENTORY)
|
constants.TRIPLEO_STATIC_INVENTORY)
|
||||||
@ -392,6 +394,7 @@ class OvercloudCephDeploy(command.Command):
|
|||||||
"working_dir": working_dir,
|
"working_dir": working_dir,
|
||||||
"stack_name": parsed_args.stack,
|
"stack_name": parsed_args.stack,
|
||||||
"tripleo_cephadm_standalone": parsed_args.standalone,
|
"tripleo_cephadm_standalone": parsed_args.standalone,
|
||||||
|
"tripleo_cephadm_ingress": ceph_ingress,
|
||||||
"tripleo_ceph_client_vars": os.path.join(working_dir,
|
"tripleo_ceph_client_vars": os.path.join(working_dir,
|
||||||
'ceph_client.yml')
|
'ceph_client.yml')
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user