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

update roles osbs-master to use ansible 2.0 compatible environment definition

Browse source
This commit is contained in:
Adam Miller 2016-02-01 17:15:38 +00:00
parent a1493f522e
commit fdb4e4ae8e
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/osbs-master/tasks/main.yml
View file

@ -74,7 +74,7 @@
- name: import the osbs-builder role - name: import the osbs-builder role
command: oc replace --force=true --filename={{ osbs_openshift_home }}/role-osbs-builder.yml command: oc replace --force=true --filename={{ osbs_openshift_home }}/role-osbs-builder.yml
environment: osbs_environment environment: "{{ osbs_environment }}"
- name: copy role bindings - name: copy role bindings
template: src=openshift-rolebinding.yml.j2 dest={{ osbs_openshift_home }}/rolebinding-{{ item.name }}.yml template: src=openshift-rolebinding.yml.j2 dest={{ osbs_openshift_home }}/rolebinding-{{ item.name }}.yml
@ -94,7 +94,7 @@
- name: import the role bindings - name: import the role bindings
command: oc replace --force=true --filename={{ osbs_openshift_home }}/rolebinding-{{ item }}.yml command: oc replace --force=true --filename={{ osbs_openshift_home }}/rolebinding-{{ item }}.yml
environment: osbs_environment environment: "{{ osbs_environment }}"
with_items: with_items:
- osbs-readonly - osbs-readonly
- osbs-readwrite - osbs-readwrite
@ -105,7 +105,7 @@
- name: import resource quotas - name: import resource quotas
command: oc replace --force=true --filename={{ osbs_openshift_home }}/resourcequota.yml command: oc replace --force=true --filename={{ osbs_openshift_home }}/resourcequota.yml
environment: osbs_environment environment: "{{ osbs_environment }}"
# Useful when using "oc" to inspect openshift state. # Useful when using "oc" to inspect openshift state.
- name: add KUBECONFIG to .bashrc - name: add KUBECONFIG to .bashrc