fix 'pcs cluster auth'

neo502721 · Feb 1, 2018 · 7b5994d · 7b5994d
1 parent ed3e020
commit 7b5994d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,9 @@
   crm\_feature\_set <= 3.0.8 ([rhbz#1488044])
 - Fixed `pcs cluster auth` in a cluster when not authenticated and using
   a non-default port ([rhbz#1415197])
+- Fixed `pcs cluster auth` in a cluster when previously authenticated using a
+  non-default port and reauthenticating using an implicit default port
+  ([rhbz#1415197])
 
 [ghissue#153]: https://github.com/ClusterLabs/pcs/issues/153
 [rhbz#1415197]: https://bugzilla.redhat.com/show_bug.cgi?id=1415197

diff --git a/pcsd/pcs.rb b/pcsd/pcs.rb
@@ -1247,7 +1247,7 @@ def pcs_auth(auth_user, nodes, username, password, force=false, local=true)
   auth_responses.each { |node, response|
     if 'ok' == response['status']
       new_tokens[node] = response['token']
-      ports[node] = nodes[node]
+      ports[node] = nodes[node] || PCSD_DEFAULT_PORT
     end
   }
   if not new_tokens.empty?