openstack/python-tripleoclient
Code Issues Proposed changes

Remove capabilities-map.yaml related functionality

Browse Source 
Change-Id: I590e6f34da0e225df889cc6a2b906be94d30fc6d
Depends-On: https://review.opendev.org/708307
This commit is contained in:
Rabi Mishra 2020-02-18 10:59:51 +05:30
parent 4c4e6aacd2
commit 53986c2f73
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleoclient/tests/v1/test_overcloud_plan.py
View File

@ -266,10 +266,6 @@ class TestOvercloudCreatePlan(utils.TestCommand):
{u'hash': u'0f1043e65e95ec24054a4ea63cdb3984',
u'last_modified': u'2016-12-09T21:18:19.612600', u'bytes': 583,
u'name': u'bootstrap-config.yaml',
u'content_type': u'application/octet-stream'},
{u'hash': u'f9415b93617acd6b151582543a77c689',
u'last_modified': u'2016-12-09T21:18:16.486870', u'bytes': 20903,
u'name': u'capabilities-map.yaml',
u'content_type': u'application/octet-stream'}]
)
@ -294,7 +290,6 @@ class TestOvercloudCreatePlan(utils.TestCommand):
self.swift.get_account.assert_called_once()
self.swift.get_container.assert_called_once_with('overcast')
self.swift.delete_object.assert_has_calls([
mock.call('overcast', u'capabilities-map.yaml'),
mock.call('overcast', u'bootstrap-config.yaml'),
mock.call('overcast', u'all-nodes-validation.yaml'),
], any_order=True)

6
tripleoclient/v1/tripleo_deploy.py
View File

@ -294,15 +294,11 @@ class Deploy(command.Command):
symlinks=True)
def _set_default_plan(self):
"""Populate default plan-environment.yaml and capabilities-map.yaml."""
"""Populate default plan-environment.yaml."""
if not os.path.isfile(os.path.join(self.tht_render,
'plan-environment.yaml')):
shutil.copy(os.path.join(self.tht_render, 'plan-samples',
'openstack', 'plan-environment.yaml'), self.tht_render)
if not os.path.isfile(os.path.join(self.tht_render,
'capabilities-map.yaml')):
shutil.copy(os.path.join(self.tht_render, 'plan-samples',
'openstack', 'capabilities-map.yaml'), self.tht_render)
def _cleanup_working_dirs(self, cleanup=False, user=None):
"""Cleanup temporary working directories