Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

fix syntax for environment in osbs-on-openshift role

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2017-10-05 20:58:15 +00:00
parent dacad159b7
commit 17dee9d6d3
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
roles/osbs-on-openshift/tasks/main.yml
View file

@ -7,6 +7,7 @@
register: new_project register: new_project
failed_when: new_project.rc != 0 and ('already exists' not in new_project.stderr) failed_when: new_project.rc != 0 and ('already exists' not in new_project.stderr)
changed_when: new_project.rc == 0 changed_when: new_project.rc == 0
args:
environment: "{{osbs_environment}}" environment: "{{osbs_environment}}"
when: osbs_namespace_create when: osbs_namespace_create
@ -22,6 +23,7 @@
--filename={{ osbs_openshift_home }}/serviceaccount-{{ item.item }}.yml --filename={{ osbs_openshift_home }}/serviceaccount-{{ item.item }}.yml
register: service_account_import register: service_account_import
failed_when: service_account_import.rc != 0 and ('already exists' not in service_account_import.stderr) failed_when: service_account_import.rc != 0 and ('already exists' not in service_account_import.stderr)
args:
environment: "{{osbs_environment}}" environment: "{{osbs_environment}}"
with_items: "{{ yaml_sa.results | default([]) }}" with_items: "{{ yaml_sa.results | default([]) }}"
when: item.changed when: item.changed
@ -49,6 +51,7 @@
--namespace={{ osbs_namespace }} --namespace={{ osbs_namespace }}
--force=true --force=true
--filename={{ osbs_openshift_home }}/rolebinding-{{ item.item.name }}.yml --filename={{ osbs_openshift_home }}/rolebinding-{{ item.item.name }}.yml
args:
environment: "{{osbs_environment}}" environment: "{{osbs_environment}}"
with_items: "{{ yaml_rolebindings.results }}" with_items: "{{ yaml_rolebindings.results }}"
when: item.changed when: item.changed
@ -66,6 +69,7 @@
--namespace={{ osbs_namespace }} --namespace={{ osbs_namespace }}
--force=true --force=true
--filename={{ osbs_openshift_home }}/resourcequota.yml --filename={{ osbs_openshift_home }}/resourcequota.yml
args:
environment: "{{osbs_environment}}" environment: "{{osbs_environment}}"
when: osbs_master_max_pods is defined and osbs_master_max_pods >= 0 and yaml_resourcequotas.changed when: osbs_master_max_pods is defined and osbs_master_max_pods >= 0 and yaml_resourcequotas.changed
tags: tags:
@ -77,6 +81,7 @@
--namespace={{ osbs_namespace }} --namespace={{ osbs_namespace }}
--ignore-not-found=true --ignore-not-found=true
resourcequota concurrentbuilds resourcequota concurrentbuilds
args:
environment: "{{osbs_environment}}" environment: "{{osbs_environment}}"
when: osbs_master_max_pods is not defined or osbs_master_max_pods < 0 when: osbs_master_max_pods is not defined or osbs_master_max_pods < 0
tags: tags:
@ -97,6 +102,7 @@
--namespace={{ osbs_namespace }} --namespace={{ osbs_namespace }}
--force=true --force=true
--filename={{ osbs_openshift_home }}/limitrange.yml --filename={{ osbs_openshift_home }}/limitrange.yml
args:
environment: "{{osbs_environment}}" environment: "{{osbs_environment}}"
when: osbs_master_cpu_limitrange is defined and osbs_master_cpu_limitrange and yaml_limitrange.changed when: osbs_master_cpu_limitrange is defined and osbs_master_cpu_limitrange and yaml_limitrange.changed
tags: tags:
@ -108,6 +114,7 @@
--namespace={{ osbs_namespace }} --namespace={{ osbs_namespace }}
--ignore-not-found=true --ignore-not-found=true
limitrange cpureq limitrange cpureq
args:
environment: "{{osbs_environment}}" environment: "{{osbs_environment}}"
when: osbs_master_cpu_limitrange is not defined or not osbs_master_cpu_limitrange when: osbs_master_cpu_limitrange is not defined or not osbs_master_cpu_limitrange
tags: tags:
@ -118,7 +125,6 @@
template: template:
src: role-osbs-custom-build.yml.j2 src: role-osbs-custom-build.yml.j2
dest: "{{ osbs_openshift_home }}/{{ inventory_hostname }}-{{ osbs_namespace }}-role-osbs-custom-build.yml" dest: "{{ osbs_openshift_home }}/{{ inventory_hostname }}-{{ osbs_namespace }}-role-osbs-custom-build.yml"
environment: "{{ osbs_environment }}"
register: yaml_role register: yaml_role
tags: tags:
- oc - oc
@ -129,6 +135,7 @@
--namespace={{ osbs_namespace }} --namespace={{ osbs_namespace }}
--force=true --force=true
--filename={{ osbs_openshift_home }}/{{ inventory_hostname }}-{{ osbs_namespace }}-role-osbs-custom-build.yml --filename={{ osbs_openshift_home }}/{{ inventory_hostname }}-{{ osbs_namespace }}-role-osbs-custom-build.yml
args:
environment: "{{ osbs_environment }}" environment: "{{ osbs_environment }}"
when: yaml_role.changed when: yaml_role.changed
tags: tags: