diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-04 16:19:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 16:19:08 -0400 |
| commit | f338eb1e5728af88ee6de26e7a703b521b386f7a (patch) | |
| tree | aa4cc02ce7bc7e99ec0f3c7fdd66948be0f4fc8a /roles | |
| parent | 55a98d5ab6d66eb5c0a357737f7729608a54a873 (diff) | |
| parent | 59be7a3a6d44d261c3a592b00e589fce3d50d435 (diff) | |
| download | openshift-f338eb1e5728af88ee6de26e7a703b521b386f7a.tar.gz openshift-f338eb1e5728af88ee6de26e7a703b521b386f7a.tar.bz2 openshift-f338eb1e5728af88ee6de26e7a703b521b386f7a.tar.xz openshift-f338eb1e5728af88ee6de26e7a703b521b386f7a.zip | |
Merge pull request #4978 from ewolinetz/bz1477440
Fixing SA and clusterrole namespaces
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_metrics/tasks/generate_rolebindings.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/generate_serviceaccounts.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_metrics/tasks/generate_rolebindings.yaml b/roles/openshift_metrics/tasks/generate_rolebindings.yaml index 9882b1eb5..407d3196f 100644 --- a/roles/openshift_metrics/tasks/generate_rolebindings.yaml +++ b/roles/openshift_metrics/tasks/generate_rolebindings.yaml @@ -41,7 +41,7 @@ - name: Set hawkular cluster roles oc_obj: name: hawkular-metrics - namespace: "{{ openshift_metrics_hawkular_agent_namespace }}" + namespace: "{{ openshift_metrics_project }}" kind: clusterrole files: - "{{ mktemp.stdout }}/templates/hawkular-cluster-role.yaml" diff --git a/roles/openshift_metrics/tasks/generate_serviceaccounts.yaml b/roles/openshift_metrics/tasks/generate_serviceaccounts.yaml index db27680fe..874b89e52 100644 --- a/roles/openshift_metrics/tasks/generate_serviceaccounts.yaml +++ b/roles/openshift_metrics/tasks/generate_serviceaccounts.yaml @@ -18,7 +18,7 @@ oc_obj: name: "{{ item }}" kind: serviceaccount - namespace: "{{ openshift_metrics_hawkular_agent_namespace }}" + namespace: "{{ openshift_metrics_project }}" files: - "{{ mktemp.stdout }}/templates/metrics-{{ item }}-sa.yaml" delete_after: true |