소스 검색

Merge pull request #8448 from jcantrill/fix_oc_adm_rolebinding

fix  The error was: KeyError: 'userNames'
Vadim Rutkovsky 6 년 전
부모
커밋
0a94b84f6c
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      roles/lib_openshift/library/oc_adm_policy_user.py
  2. 1 1
      roles/lib_openshift/src/class/oc_adm_policy_user.py

+ 1 - 1
roles/lib_openshift/library/oc_adm_policy_user.py

@@ -2096,7 +2096,7 @@ class PolicyUser(OpenShiftCLI):
 
         for binding in bindings:
             if binding['roleRef']['name'] == self.config.config_options['name']['value'] and \
-                    binding['userNames'] is not None and \
+                    'userNames' in binding and binding['userNames'] is not None and \
                     self.config.config_options['user']['value'] in binding['userNames']:
                 self.role_binding = binding
                 return True

+ 1 - 1
roles/lib_openshift/src/class/oc_adm_policy_user.py

@@ -108,7 +108,7 @@ class PolicyUser(OpenShiftCLI):
 
         for binding in bindings:
             if binding['roleRef']['name'] == self.config.config_options['name']['value'] and \
-                    binding['userNames'] is not None and \
+                    'userNames' in binding and binding['userNames'] is not None and \
                     self.config.config_options['user']['value'] in binding['userNames']:
                 self.role_binding = binding
                 return True