diff options
| author | Russell Teague <rteague@redhat.com> | 2016-12-09 14:40:43 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2016-12-12 13:54:24 -0500 |
| commit | be97433dd559a3bdae4baedda20a7f17bd47450b (patch) | |
| tree | 6f89b1ec06c19a9de87a5d1108d8ba9b6f069f34 /roles/openshift_metrics | |
| parent | bf3fa6162880e2dff9c23d42ceb2197e071ba570 (diff) | |
| download | openshift-be97433dd559a3bdae4baedda20a7f17bd47450b.tar.gz openshift-be97433dd559a3bdae4baedda20a7f17bd47450b.tar.bz2 openshift-be97433dd559a3bdae4baedda20a7f17bd47450b.tar.xz openshift-be97433dd559a3bdae4baedda20a7f17bd47450b.zip | |
YAML Linting
* Added checks to make ci for yaml linting
* Modified y(a)ml files to pass lint checks
Diffstat (limited to 'roles/openshift_metrics')
| -rw-r--r-- | roles/openshift_metrics/tasks/main.yaml | 6 | ||||
| -rw-r--r-- | roles/openshift_metrics/vars/main.yaml | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index be3256f02..68e4a48b9 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -38,9 +38,9 @@ get pods -l {{ item }} | grep -q Running register: metrics_pods_status with_items: - - metrics-infra=hawkular-metrics - - metrics-infra=heapster - - metrics-infra=hawkular-cassandra + - metrics-infra=hawkular-metrics + - metrics-infra=heapster + - metrics-infra=hawkular-cassandra failed_when: false changed_when: false diff --git a/roles/openshift_metrics/vars/main.yaml b/roles/openshift_metrics/vars/main.yaml index 0331bcb89..6c207d6ac 100644 --- a/roles/openshift_metrics/vars/main.yaml +++ b/roles/openshift_metrics/vars/main.yaml @@ -1,6 +1,7 @@ +--- hawkular_permission_oc_commands: - - policy add-role-to-user edit system:serviceaccount:openshift-infra:metrics-deployer -n openshift-infra - - policy add-cluster-role-to-user cluster-admin system:serviceaccount:openshift-infra:heapster + - policy add-role-to-user edit system:serviceaccount:openshift-infra:metrics-deployer -n openshift-infra + - policy add-cluster-role-to-user cluster-admin system:serviceaccount:openshift-infra:heapster metrics_deployer_sa: apiVersion: v1 @@ -8,7 +9,7 @@ metrics_deployer_sa: metadata: name: metrics-deployer secrets: - - name: metrics-deployer + - name: metrics-deployer hawkular_tmp_conf: /tmp/hawkular_admin.kubeconfig |