summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted_templates/tasks/main.yml
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-05 21:17:25 -0800
committerGitHub <noreply@github.com>2018-01-05 21:17:25 -0800
commit18c555e595551c3b5b54159616c5b9ece2d0983b (patch)
treeee2d65c5235476a40db81181a78a18afdc13e4e6 /roles/openshift_hosted_templates/tasks/main.yml
parent0c5f70ad87e25f26a074613ad4576d5bcd759054 (diff)
parent7923eb92c86a128504436ba0708c96b655de5269 (diff)
downloadopenshift-18c555e595551c3b5b54159616c5b9ece2d0983b.tar.gz
openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.tar.bz2
openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.tar.xz
openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.zip
Merge pull request #6597 from mgugino-upstream-stage/etc-remove-become-no
Automatic merge from submit-queue. Remove become=no from etcd cert tasks etcd runs some actions locally to copy certs from the CA cert host. We shouldn't hard-code become behavior as it can be unexpected for the end user.
Diffstat (limited to 'roles/openshift_hosted_templates/tasks/main.yml')
-rw-r--r--roles/openshift_hosted_templates/tasks/main.yml12
1 files changed, 8 insertions, 4 deletions
diff --git a/roles/openshift_hosted_templates/tasks/main.yml b/roles/openshift_hosted_templates/tasks/main.yml
index b2313c297..672d25b4d 100644
--- a/roles/openshift_hosted_templates/tasks/main.yml
+++ b/roles/openshift_hosted_templates/tasks/main.yml
@@ -1,20 +1,25 @@
---
- name: Create local temp dir for OpenShift hosted templates copy
local_action: command mktemp -d /tmp/openshift-ansible-XXXXXXX
- become: False
register: copy_hosted_templates_mktemp
run_once: True
# AUDIT:changed_when: not set here because this task actually
# creates something
+- name: Create local temp dir for OpenShift examples copy
+ local_action: command chmod 755 "{{ copy_hosted_templates_mktemp.stdout }}"
+ run_once: True
+
- name: Create tar of OpenShift examples
local_action: command tar -C "{{ role_path }}/files/{{ content_version }}/{{ hosted_deployment_type }}" -cvf "{{ copy_hosted_templates_mktemp.stdout }}/openshift-hosted-templates.tar" .
args:
# Disables the following warning:
# Consider using unarchive module rather than running tar
warn: no
- become: False
- register: copy_hosted_templates_tar
+
+- name: Create local temp dir for OpenShift examples copy
+ local_action: command chmod 744 "{{ copy_hosted_templates_mktemp.stdout }}/openshift-hosted-templates.tar"
+ run_once: True
- name: Create remote OpenShift hosted templates directory
file:
@@ -28,7 +33,6 @@
dest: "{{ hosted_base }}/"
- name: Cleanup the OpenShift hosted templates temp dir
- become: False
local_action: file dest="{{ copy_hosted_templates_mktemp.stdout }}" state=absent
- name: Modify registry paths if registry_url is not registry.access.redhat.com