summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/tasks
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2018-01-03 15:10:26 -0500
committerMichael Gugino <mgugino@redhat.com>2018-01-05 14:53:44 -0500
commit7923eb92c86a128504436ba0708c96b655de5269 (patch)
treed0f405d10e670fb14e64122b3c6036e6ba32cc1d /roles/openshift_examples/tasks
parentedde1f2bf0fa180fc69d905ce2aa27e68f7295dd (diff)
downloadopenshift-7923eb92c86a128504436ba0708c96b655de5269.tar.gz
openshift-7923eb92c86a128504436ba0708c96b655de5269.tar.bz2
openshift-7923eb92c86a128504436ba0708c96b655de5269.tar.xz
openshift-7923eb92c86a128504436ba0708c96b655de5269.zip
Remove become=no from various roles and tasks
etcd runs some actions locally to copy certs from the CA cert host. This commit ensures that we respect the end user's intended behavior with become when using 'anisble_become' in the inventory. Other roles with similar tasks have been modified in the same manner. We shouldn't hard-code become behavior as it can be unexpected for the end user. This only currently works in the CI because the CI passes the '-b' argument on the command line, which will override the task behavior.
Diffstat (limited to 'roles/openshift_examples/tasks')
-rw-r--r--roles/openshift_examples/tasks/main.yml12
1 files changed, 8 insertions, 4 deletions
diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml
index a09a598bd..ff04cdf9c 100644
--- a/roles/openshift_examples/tasks/main.yml
+++ b/roles/openshift_examples/tasks/main.yml
@@ -13,18 +13,23 @@
# use it either due to changes introduced in Ansible 2.x.
- name: Create local temp dir for OpenShift examples copy
local_action: command mktemp -d /tmp/openshift-ansible-XXXXXXX
- become: False
register: copy_examples_mktemp
run_once: True
+- name: Create local temp dir for OpenShift examples copy
+ local_action: command chmod 755 "{{ copy_examples_mktemp.stdout }}"
+ run_once: True
+
- name: Create tar of OpenShift examples
local_action: command tar -C "{{ role_path }}/files/examples/{{ content_version }}/" -cvf "{{ copy_examples_mktemp.stdout }}/openshift-examples.tar" .
args:
# Disables the following warning:
# Consider using unarchive module rather than running tar
warn: no
- become: False
- register: copy_examples_tar
+
+- name: Create local temp dir for OpenShift examples copy
+ local_action: command chmod 744 "{{ copy_examples_mktemp.stdout }}/openshift-examples.tar"
+ run_once: True
- name: Create the remote OpenShift examples directory
file:
@@ -38,7 +43,6 @@
dest: "{{ examples_base }}/"
- name: Cleanup the OpenShift Examples temp dir
- become: False
local_action: file dest="{{ copy_examples_mktemp.stdout }}" state=absent
# Done copying examples