Merge "Ensure tripleo_ceph_client_vars is set consistently" into stable/wallaby
This commit is contained in:
commit
54998e2dfd
|
@ -210,8 +210,8 @@ def export_ceph(stack, cephx,
|
|||
fsid = ceph_data['fsid']
|
||||
|
||||
if 'cephadm' in config_download_files:
|
||||
ceph_client = "cephadm/ceph_client.yml"
|
||||
file = os.path.join(config_download_dir, stack, ceph_client)
|
||||
file = os.path.join(oooutils.get_default_working_dir(stack),
|
||||
'ceph_client.yml')
|
||||
if not os.path.exists(file):
|
||||
# fall back to old path if user had LP 1978846 during deployment
|
||||
file = "/home/stack/ceph_client.yaml"
|
||||
|
|
|
@ -67,6 +67,7 @@ class TestOvercloudCephDeploy(fakes.FakePlaybookExecution):
|
|||
"deployed_ceph_tht_path": mock.ANY,
|
||||
"working_dir": mock.ANY,
|
||||
"stack_name": 'overcloud',
|
||||
"tripleo_ceph_client_vars": mock.ANY,
|
||||
"tripleo_cephadm_standalone": False,
|
||||
'tripleo_cephadm_ssh_user': 'jimmy',
|
||||
'tripleo_cephadm_cluster': 'ceph',
|
||||
|
@ -112,6 +113,7 @@ class TestOvercloudCephDeploy(fakes.FakePlaybookExecution):
|
|||
"deployed_ceph_tht_path": mock.ANY,
|
||||
"working_dir": mock.ANY,
|
||||
"stack_name": 'overcloud',
|
||||
"tripleo_ceph_client_vars": mock.ANY,
|
||||
"tripleo_cephadm_standalone": False,
|
||||
'tripleo_roles_path': mock.ANY,
|
||||
'tripleo_cephadm_first_mon_ip': '127.0.0.1',
|
||||
|
|
|
@ -381,7 +381,9 @@ class OvercloudCephDeploy(command.Command):
|
|||
"deployed_ceph_tht_path": output_path,
|
||||
"working_dir": working_dir,
|
||||
"stack_name": parsed_args.stack,
|
||||
"tripleo_cephadm_standalone": parsed_args.standalone
|
||||
"tripleo_cephadm_standalone": parsed_args.standalone,
|
||||
"tripleo_ceph_client_vars": os.path.join(working_dir,
|
||||
'ceph_client.yml')
|
||||
}
|
||||
extra_vars_file = None
|
||||
# optional paths to pass to playbook
|
||||
|
|
Loading…
Reference in New Issue