infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

Fixing the syntax

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-06-18 12:06:04 +02:00
parent ce11f50223
commit 20bf0d3ec7
1 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

28
playbooks/groups/osbs-cluster.yml
View file

@ -578,7 +578,6 @@
auth_info_prod: "{{candidate_registry_osbs_prod_username}}:{{candidate_registry_osbs_prod_password}}" auth_info_prod: "{{candidate_registry_osbs_prod_username}}:{{candidate_registry_osbs_prod_password}}"
auth_info_stg: "{{candidate_registry_osbs_stg_username}}:{{candidate_registry_osbs_stg_password}}" auth_info_stg: "{{candidate_registry_osbs_stg_username}}:{{candidate_registry_osbs_stg_password}}"
origin_version: "{{origin_version_out.stdout}}"
- name: Create the dockercfg secret file - name: Create the dockercfg secret file
local_action: > local_action: >
template template
@ -594,15 +593,6 @@
- source: "/tmp/.dockercfg" - source: "/tmp/.dockercfg"
dest: .dockercfg dest: .dockercfg
- role: osbs-secret
osbs_namespace: "worker"
osbs_secret_name: "v2-registry-dockercfg"
osbs_secret_type: kubernetes.io/dockercfg
osbs_secret_files:
- source: "/tmp/.dockercfg"
dest: .dockercfg
when: env == "staging"
post_tasks: post_tasks:
- name: Delete the temporary secret file - name: Delete the temporary secret file
local_action: > local_action: >
@ -626,7 +616,6 @@
auth_info_prod: "{{candidate_registry_osbs_prod_username}}:{{candidate_registry_osbs_prod_password}}" auth_info_prod: "{{candidate_registry_osbs_prod_username}}:{{candidate_registry_osbs_prod_password}}"
auth_info_stg: "{{candidate_registry_osbs_stg_username}}:{{candidate_registry_osbs_stg_password}}" auth_info_stg: "{{candidate_registry_osbs_stg_username}}:{{candidate_registry_osbs_stg_password}}"
origin_version: "{{origin_version_out.stdout}}"
- name: Create the dockercfg secret file - name: Create the dockercfg secret file
local_action: > local_action: >
template template
@ -634,14 +623,15 @@
dest="/tmp/.dockercfg" dest="/tmp/.dockercfg"
mode=0400 mode=0400
- role: osbs-secret roles:
osbs_namespace: "{{ osbs_worker_namespace }}" - role: osbs-secret
osbs_secret_name: "v2-registry-dockercfg" osbs_namespace: "{{ osbs_worker_namespace }}"
osbs_secret_type: kubernetes.io/dockercfg osbs_secret_name: "v2-registry-dockercfg"
osbs_secret_files: osbs_secret_type: kubernetes.io/dockercfg
- source: "/tmp/.dockercfg" osbs_secret_files:
dest: .dockercfg - source: "/tmp/.dockercfg"
when: env == "staging" dest: .dockercfg
when: env == "staging"
post_tasks: post_tasks:
- name: Delete the temporary secret file - name: Delete the temporary secret file