diff --git a/tripleoclient/tests/v2/overcloud_ceph/test_overcloud_ceph.py b/tripleoclient/tests/v2/overcloud_ceph/test_overcloud_ceph.py index 0c7171ef2..8eb2cb794 100644 --- a/tripleoclient/tests/v2/overcloud_ceph/test_overcloud_ceph.py +++ b/tripleoclient/tests/v2/overcloud_ceph/test_overcloud_ceph.py @@ -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', diff --git a/tripleoclient/v2/overcloud_ceph.py b/tripleoclient/v2/overcloud_ceph.py index 60c59ac76..7e423c9e0 100644 --- a/tripleoclient/v2/overcloud_ceph.py +++ b/tripleoclient/v2/overcloud_ceph.py @@ -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') }