diff options
author | Vincent Schwarzer <vincent.schwarzer@yahoo.de> | 2017-05-10 14:23:04 +0200 |
---|---|---|
committer | Vincent Schwarzer <vincent.schwarzer@yahoo.de> | 2017-05-18 12:05:53 +0200 |
commit | 6c85255ad4ec8ed25af2c9bdd717ce43e68e134c (patch) | |
tree | 8a4cb4bf4a5292a608c1b3a47a621e3f99c7f0cb /roles/calico_master | |
parent | e748591d96c64560c94f141a178b9f719a28721a (diff) | |
download | openshift-6c85255ad4ec8ed25af2c9bdd717ce43e68e134c.tar.gz openshift-6c85255ad4ec8ed25af2c9bdd717ce43e68e134c.tar.bz2 openshift-6c85255ad4ec8ed25af2c9bdd717ce43e68e134c.tar.xz openshift-6c85255ad4ec8ed25af2c9bdd717ce43e68e134c.zip |
Adjusted Naming Schema of Calico Roles
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 3358abe23..f3fd9f27c 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 |