summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-26 11:41:18 -0800
committerGitHub <noreply@github.com>2018-01-26 11:41:18 -0800
commitc73b77cb8489a0ac1f56457c19250ff217c6a47b (patch)
tree76e1ce58234ace093b502c7e27ffee0a273d93e4
parent72ae4f5e8354491d4bb416d587b7e20d6d76e458 (diff)
parent0a2b60f16ffc85877e5b6c149930e0fa007fd7fa (diff)
downloadopenshift-c73b77cb8489a0ac1f56457c19250ff217c6a47b.tar.gz
openshift-c73b77cb8489a0ac1f56457c19250ff217c6a47b.tar.bz2
openshift-c73b77cb8489a0ac1f56457c19250ff217c6a47b.tar.xz
openshift-c73b77cb8489a0ac1f56457c19250ff217c6a47b.zip
Merge pull request #6871 from joelddiaz/oc_group_ignore_users
Automatic merge from submit-queue. ignore 'users' field in oc_group module oc_group doesn't manage the list of users assigned to a group (oc_user does). so when doing an oc_group: state: present name: groupA on a pre-existing group 'groupA' with already defined users, oc_group would detect a difference and blow away the existing users fix this by adding 'users' to the list of fields to ignore when determining whether there are object differences
-rw-r--r--roles/lib_openshift/library/oc_group.py2
-rw-r--r--roles/lib_openshift/src/class/oc_group.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_openshift/library/oc_group.py b/roles/lib_openshift/library/oc_group.py
index 1b63a6c13..72023eaf7 100644
--- a/roles/lib_openshift/library/oc_group.py
+++ b/roles/lib_openshift/library/oc_group.py
@@ -1485,7 +1485,7 @@ class OCGroup(OpenShiftCLI):
def needs_update(self):
''' verify an update is needed '''
- return not Utils.check_def_equal(self.config.data, self.group.yaml_dict, skip_keys=[], debug=True)
+ return not Utils.check_def_equal(self.config.data, self.group.yaml_dict, skip_keys=['users'], debug=True)
# pylint: disable=too-many-return-statements,too-many-branches
@staticmethod
diff --git a/roles/lib_openshift/src/class/oc_group.py b/roles/lib_openshift/src/class/oc_group.py
index 89fb09ea4..53e6b6766 100644
--- a/roles/lib_openshift/src/class/oc_group.py
+++ b/roles/lib_openshift/src/class/oc_group.py
@@ -59,7 +59,7 @@ class OCGroup(OpenShiftCLI):
def needs_update(self):
''' verify an update is needed '''
- return not Utils.check_def_equal(self.config.data, self.group.yaml_dict, skip_keys=[], debug=True)
+ return not Utils.check_def_equal(self.config.data, self.group.yaml_dict, skip_keys=['users'], debug=True)
# pylint: disable=too-many-return-statements,too-many-branches
@staticmethod