openstack/tripleo-common
Code Issues Proposed changes

Fix overcloud export plan

Browse Source 
Currently exporting the plan for the overcloud gives us (note the
spurious 3600 argument there):
(undercloud) [stack@undercloud t]$ openstack overcloud plan export overcloud
Exporting plan overcloud...
Started Mistral Workflow tripleo.plan_management.v1.export_deployment_plan. Execution ID: 19da7423-ff44-4785-9f1f-237289b60dda
Error while creating a tarball: Unexpected error while running command.
Command: /usr/bin/tar -C /tmp/tmpiBEE9d 3600 /tmp/tmpOST_qM --exclude .git --exclude .tox --exclude *.pyc --exclude *.pyo .
Exit code: 2
Stdout: u''
Stderr: u"/usr/bin/tar: You must specify one of the `-Acdtrux' or `--test-label' options\nTry `/usr/bin/tar --help' or `/usr/bin/tar --usage' for more information.\n"
Exception exporting plan: Error while creating a tarball: Unexpected error while running command.
Command: /usr/bin/tar -C /tmp/tmpiBEE9d 3600 /tmp/tmpOST_qM --exclude .git --exclude .tox --exclude *.pyc --exclude *.pyo .
Exit code: 2
Stdout: u''
Stderr: u"/usr/bin/tar: You must specify one of the `-Acdtrux' or `--test-label' options\nTry `/usr/bin/tar --help' or `/usr/bin/tar --usage' for more information.\n"

The reason is that in tripleo_common/actions/plan.py we call the
following:
swiftutils.create_and_upload_tarball(
  swift, tmp_dir, self.exports_container, tarball_name,
  self.delete_after)

The reason is that in
tripleo_common/utils/swift.py:create_and_upload_tarball() we added
'tarball_options' as an option but we did not add it at the end and we
had a caller using a positional argument.

Let's make sure that 'delete_after' is passed as a named argument.

Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com>

Change-Id: Idda2f6da3d84d1c448d941c962a07616863d61bf
Closes-Bug: #1749204
This commit is contained in:
Michele Baldessari 2018-02-13 15:59:28 +01:00
parent 500b6af83a
commit 28751a5048
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/actions/plan.py
View File

@ -193,7 +193,7 @@ class ExportPlanAction(base.TripleOAction):
swiftutils.download_container(swift, self.plan, tmp_dir)
swiftutils.create_and_upload_tarball(
swift, tmp_dir, self.exports_container, tarball_name,
self.delete_after)
delete_after=self.delete_after)
except swiftexceptions.ClientException as err:
msg = "Error attempting an operation on container: %s" % err
return actions.Result(error=msg)