Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding changed_whens for role, rolebinding, and scc reconciliation ba… #3517

Merged
merged 3 commits into from Mar 6, 2017
Merged

Adding changed_whens for role, rolebinding, and scc reconciliation ba… #3517

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a0c52a
Adding changed_whens for role, rolebinding, and scc reconciliation ba…
ewolinetz Feb 27, 2017
f7c801f
Resolving yammlint errors
ewolinetz Mar 1, 2017
352917a
Updating stdout check for changed_when
ewolinetz Mar 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 20 additions & 4 deletions playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
View file
Open in desktop
Expand Up @@ -173,7 +173,11 @@
- name: Reconcile Cluster Roles
command: >
{{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig
policy reconcile-cluster-roles --additive-only=true --confirm
policy reconcile-cluster-roles --additive-only=true --confirm -o name
register: reconcile_cluster_role_result
changed_when:
- reconcile_cluster_role_result.stdout != ''
- reconcile_cluster_role_result.rc == 0
run_once: true

- name: Reconcile Cluster Role Bindings
Expand All @@ -184,19 +188,31 @@
--exclude-groups=system:authenticated:oauth
--exclude-groups=system:unauthenticated
--exclude-users=system:anonymous
--additive-only=true --confirm
--additive-only=true --confirm -o name
when: origin_reconcile_bindings | bool or ent_reconcile_bindings | bool
register: reconcile_bindings_result
changed_when:
- reconcile_bindings_result.stdout != ''
- reconcile_bindings_result.rc == 0
run_once: true

- name: Reconcile Jenkins Pipeline Role Bindings
command: >
{{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig policy reconcile-cluster-role-bindings system:build-strategy-jenkinspipeline --confirm
{{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig policy reconcile-cluster-role-bindings system:build-strategy-jenkinspipeline --confirm -o name
run_once: true
register: reconcile_jenkins_role_binding_result
changed_when:
- reconcile_jenkins_role_binding_result.stdout != ''
- reconcile_jenkins_role_binding_result.rc == 0
when: openshift.common.version_gte_3_4_or_1_4 | bool

- name: Reconcile Security Context Constraints
command: >
{{ openshift.common.client_binary }} adm policy reconcile-sccs --confirm --additive-only=true
{{ openshift.common.client_binary }} adm policy reconcile-sccs --confirm --additive-only=true -o name
register: reconcile_scc_result
changed_when:
- reconcile_scc_result.stdout != ''
- reconcile_scc_result.rc == 0
run_once: true

- set_fact:
Expand Down