diff --git a/0001-Make-cluster-config-force-a-boolean.patch b/0001-Make-cluster-config-force-a-boolean.patch new file mode 100644 index 0000000000000000000000000000000000000000..00e460de4d33c2f50ad4da0daa8b5cd3f50f30ba --- /dev/null +++ b/0001-Make-cluster-config-force-a-boolean.patch @@ -0,0 +1,35 @@ +From 6bef59aec50e41ec2133fad1bd1fc4c954a08312 Mon Sep 17 00:00:00 2001 +From: Ricardo Rocha <rocha.porto@gmail.com> +Date: Mon, 9 Oct 2017 08:16:54 +0000 +Subject: [PATCH] Make cluster config --force a boolean + +Option --force of openstack coe cluster config is a boolean and should not +take an argument. Fix message in argument description. + +Change-Id: Ic526589a8f5c11b13e16b080a04e262d8393c387 +Closes-Bug: #1721267 +(cherry picked from commit 92fa44e1d94ee95e0279338e9f719a9f64e6fce7) +--- + magnumclient/osc/v1/clusters.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/magnumclient/osc/v1/clusters.py b/magnumclient/osc/v1/clusters.py +index 274ed93..e7380e0 100644 +--- a/magnumclient/osc/v1/clusters.py ++++ b/magnumclient/osc/v1/clusters.py +@@ -263,9 +263,10 @@ class ConfigCluster(command.Command): + help=_('Directory to save the certificate and config files.')) + parser.add_argument( + '--force', +- metavar='<force>', ++ action='store_true', ++ dest='force', + default=False, +- help=_('Directory to save the certificate and config files.')) ++ help=_('Overwrite files if existing.')) + + return parser + +-- +2.9.3 + diff --git a/python-magnumclient.spec b/python-magnumclient.spec index 6c8f672debd24676f57731ac7a533a045c11dcb9..452337e5468a3572138cbe2b654866d8fdb1cc4a 100644 --- a/python-magnumclient.spec +++ b/python-magnumclient.spec @@ -11,13 +11,14 @@ Name: python-%{pname} Version: 2.7.0 -Release: 1.1%{?dist} +Release: 1.2%{?dist} Summary: Client library for Magnum API License: ASL 2.0 URL: https://launchpad.net/python-magnumclient -Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz BuildArch: noarch +Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz +Patch0: 0001-Make-cluster-config-force-a-boolean.patch %description This is a client library for Magnum built on the Magnum API. @@ -222,6 +223,9 @@ mv magnum.py3 %{buildroot}%{_bindir}/magnum %endif %changelog +* Mon Oct 09 2017 Ricardo Rocha <ricardo.rocha@cern.ch> 2.7.0-1.2 +- Make --force a boolean on cluster config + * Mon Sep 25 2017 Ricardo Rocha <ricardo.rocha@cern.ch> 2.7.0-1.1 - Rebuild for CERN Pike release