Revert "fix syntax for environment in osbs-on-openshift role"

This reverts commit 17dee9d6d3.
This commit is contained in:
Adam Miller 2017-10-05 21:17:31 +00:00
parent 17dee9d6d3
commit 524bcc4667

View file

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