diff options
| author | Tim Bielawa <timbielawa@gmail.com> | 2016-12-12 11:39:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 11:39:44 -0800 |
| commit | 7374505de2a11b94d22672b8da7e405b919a15bc (patch) | |
| tree | 51881c3f16f1f7368bdbf62e0478a6c292a5470a /roles/openshift_metrics | |
| parent | 91fba8015e9e8035cca2444dbbc8954a27e2310e (diff) | |
| parent | be97433dd559a3bdae4baedda20a7f17bd47450b (diff) | |
| download | openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.gz openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.bz2 openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.xz openshift-7374505de2a11b94d22672b8da7e405b919a15bc.zip | |
Merge pull request #2964 from mtnbikenc/linting-refactor
YAML Linting with CI checking
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 |