diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-18 11:14:34 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-18 11:14:34 -0500 |
commit | 836147ba7f8f684f56c6b9e732c3778f1d0dab73 (patch) | |
tree | 4ff71c5785f5ea71c09362a7c038af0e2119c944 /roles/calico_master | |
parent | bf317d610b5a201c845fe337c88f2114a56ab1ad (diff) | |
parent | 6c85255ad4ec8ed25af2c9bdd717ce43e68e134c (diff) | |
download | openshift-836147ba7f8f684f56c6b9e732c3778f1d0dab73.tar.gz openshift-836147ba7f8f684f56c6b9e732c3778f1d0dab73.tar.bz2 openshift-836147ba7f8f684f56c6b9e732c3778f1d0dab73.tar.xz openshift-836147ba7f8f684f56c6b9e732c3778f1d0dab73.zip |
Merge pull request #4142 from VincentS/Adjustment_Naming_Schema
Merged by openshift-bot
Diffstat (limited to 'roles/calico_master')
-rw-r--r-- | roles/calico_master/tasks/main.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/roles/calico_master/tasks/main.yml b/roles/calico_master/tasks/main.yml index 74d3bf0fe..8ddca26d6 100644 --- a/roles/calico_master/tasks/main.yml +++ b/roles/calico_master/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: Assure the calico certs have been generated +- name: Calico Master | Assure the calico certs have been generated stat: path: "{{ item }}" with_items: @@ -7,17 +7,17 @@ - "{{ calico_etcd_cert_file}}" - "{{ calico_etcd_key_file }}" -- name: Create temp directory for policy controller definition +- name: Calico Master | Create temp directory for policy controller definition command: mktemp -d /tmp/openshift-ansible-XXXXXXX register: mktemp changed_when: False -- name: Write Calico Policy Controller definition +- name: Calico Master | Write Calico Policy Controller definition template: dest: "{{ mktemp.stdout }}/calico-policy-controller.yml" src: calico-policy-controller.yml.j2 -- name: Launch Calico Policy Controller +- name: Calico Master | Launch Calico Policy Controller command: > {{ openshift.common.client_binary }} create -f {{ mktemp.stdout }}/calico-policy-controller.yml @@ -26,14 +26,14 @@ failed_when: ('already exists' not in calico_create_output.stderr) and ('created' not in calico_create_output.stdout) changed_when: ('created' in calico_create_output.stdout) -- name: Delete temp directory +- name: Calico Master | Delete temp directory file: name: "{{ mktemp.stdout }}" state: absent changed_when: False -- name: oc adm policy add-scc-to-user privileged system:serviceaccount:kube-system:calico +- name: Calico Master | oc adm policy add-scc-to-user privileged system:serviceaccount:kube-system:calico oc_adm_policy_user: user: system:serviceaccount:kube-system:calico resource_kind: scc |