[cloudstack] branch 4.9 updated: CLOUDSTACK-10113 password resets only one at the time

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.9
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.9 by this push:
     new 382d458  CLOUDSTACK-10113 password resets only one at the time
382d458 is described below

commit 382d458f434000dfb5298e2579e9a58503b7f3a2
Author: Daan Hoogland <da...@shapeblue.com>
AuthorDate: Fri Oct 20 15:10:18 2017 +0200

    CLOUDSTACK-10113 password resets only one at the time
---
 systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py
index 3a8e06e..7873fe8 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py
@@ -18,10 +18,14 @@
 from pprint import pprint
 from netaddr import *
 
-
 def merge(dbag, data):
     """
-    Track vm passwords
+    create a dictionary of values new in data ignoring those in dbag and return it
+    :param dbag: old data
+    :param data: new data
+    :return: new data in the right format
     """
-    dbag[data['ip_address']] = data['password']
-    return dbag
+    rc = {}
+    rc['id'] = 'vmpassword'
+    rc[data['ip_address']] = data['password']
+    return rc

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].