Skip to content
Snippets Groups Projects
Commit a06fb05c authored by Ricardo Rocha's avatar Ricardo Rocha
Browse files

[cern] allow swarm-mode coe

parent 011e5c35
No related branches found
No related tags found
1 merge request!4[cern] allow swarm-mode coe
Pipeline #
diff --git a/magnumclient/v1/clusters_shell.py b/magnumclient/v1/clusters_shell.py
index 66634e4..c1ee567 100644
--- a/magnumclient/v1/clusters_shell.py
+++ b/magnumclient/v1/clusters_shell.py
@@ -232,7 +232,7 @@ def _config_cluster(cluster, cluster_template, cfg_dir='.', force=False):
if cluster_template.coe == 'kubernetes':
return _config_cluster_kubernetes(cluster, cluster_template,
cfg_dir, force)
- elif cluster_template.coe == 'swarm':
+ elif cluster_template.coe == 'swarm' or cluster_template.coe == 'swarm-mode':
return _config_cluster_swarm(cluster, cluster_template, cfg_dir, force)
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
Name: python-%{pname} Name: python-%{pname}
Version: 2.3.1 Version: 2.3.1
Release: 1.4%{?dist} Release: 1.5%{?dist}
Summary: Client library for Magnum API Summary: Client library for Magnum API
License: ASL 2.0 License: ASL 2.0
...@@ -20,6 +20,7 @@ Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_vers ...@@ -20,6 +20,7 @@ Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_vers
Patch0: 0001-Add-keypair-to-cluster-create.patch Patch0: 0001-Add-keypair-to-cluster-create.patch
Patch1: 0002-Cluster-creation-command-returns-complete-cluster-uu.patch Patch1: 0002-Cluster-creation-command-returns-complete-cluster-uu.patch
Patch2: 0003-Cluster-config-return-absolute-path.patch Patch2: 0003-Cluster-config-return-absolute-path.patch
Patch3: 0004-Allow-swarm-mode-coe.patch
BuildArch: noarch BuildArch: noarch
%description %description
...@@ -217,6 +218,9 @@ mv magnum.py3 %{buildroot}%{_bindir}/magnum ...@@ -217,6 +218,9 @@ mv magnum.py3 %{buildroot}%{_bindir}/magnum
%endif %endif
%changelog %changelog
* Wed Sep 20 2017 Ricardo Rocha <ricardo.rocha@cern.ch> 2.3.1-1.5
- Allow swarm-mode coe
* Tue Nov 22 2016 Ricardo Rocha <ricardo.rocha@cern.ch> 2.3.1-1.4 * Tue Nov 22 2016 Ricardo Rocha <ricardo.rocha@cern.ch> 2.3.1-1.4
- Cherry pick absolute path in magnum cluster-config - Cherry pick absolute path in magnum cluster-config
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment