Browse Source

when using "oc get -o name", types are now suffixed with an "s"

master
Nicolas Massé 8 years ago
parent
commit
61c88b0a0d
  1. 2
      roles/3scale/tasks/main.yml
  2. 4
      roles/microcks/tasks/main.yml
  3. 4
      roles/sso/tasks/main.yml

2
roles/3scale/tasks/main.yml

@ -7,7 +7,7 @@
- name: Create a new project for 3scale - name: Create a new project for 3scale
command: oc new-project "{{ threescale_project }}" command: oc new-project "{{ threescale_project }}"
when: '"project/" ~ threescale_project not in oc_get_projects.stdout_lines' when: '"projects/" ~ threescale_project not in oc_get_projects.stdout_lines'
- include: common/status.yml - include: common/status.yml
vars: vars:

4
roles/microcks/tasks/main.yml

@ -13,7 +13,7 @@
- name: Create a new project for Microcks - name: Create a new project for Microcks
command: oc new-project "{{ microcks_project }}" command: oc new-project "{{ microcks_project }}"
when: '"project/" ~ microcks_project not in oc_get_projects.stdout_lines' when: '"projects/" ~ microcks_project not in oc_get_projects.stdout_lines'
- name: Query existing deploymentconfigs - name: Query existing deploymentconfigs
command: oc get dc -n "{{ microcks_project }}" -o name -l "component={{ microcks_application_name }}" command: oc get dc -n "{{ microcks_project }}" -o name -l "component={{ microcks_application_name }}"
@ -22,7 +22,7 @@
- name: Deploy app if needed - name: Deploy app if needed
set_fact: set_fact:
deploy_needed: "{{ 'deploymentconfig/' ~ microcks_application_name not in oc_get_dc.stdout_lines }}" deploy_needed: "{{ 'deploymentconfigs/' ~ microcks_application_name not in oc_get_dc.stdout_lines }}"
- name: Process the OpenShift Template and create the OpenShift objects - name: Process the OpenShift Template and create the OpenShift objects
command: oc new-app -n {{ microcks_project }} --template={{ microcks_template_name }} -p MEMORY_LIMIT=1Gi command: oc new-app -n {{ microcks_project }} --template={{ microcks_template_name }} -p MEMORY_LIMIT=1Gi

4
roles/sso/tasks/main.yml

@ -45,7 +45,7 @@
- name: Create a new project for SSO - name: Create a new project for SSO
command: oc new-project "{{ sso_project }}" command: oc new-project "{{ sso_project }}"
when: '"project/" ~ sso_project not in oc_get_projects.stdout_lines' when: '"projects/" ~ sso_project not in oc_get_projects.stdout_lines'
- name: Query existing deploymentconfigs - name: Query existing deploymentconfigs
command: oc get dc -n "{{ sso_project }}" -o name -l "application={{ sso_application_name }}" command: oc get dc -n "{{ sso_project }}" -o name -l "application={{ sso_application_name }}"
@ -54,7 +54,7 @@
- name: Deploy app if needed - name: Deploy app if needed
set_fact: set_fact:
deploy_needed: "{{ 'deploymentconfig/' ~ sso_application_name not in oc_get_dc.stdout_lines }}" deploy_needed: "{{ 'deploymentconfigs/' ~ sso_application_name not in oc_get_dc.stdout_lines }}"
- name: Create a service account for SSO - name: Create a service account for SSO
command: oc create serviceaccount sso-service-account -n "{{ sso_project }}" command: oc create serviceaccount sso-service-account -n "{{ sso_project }}"

Loading…
Cancel
Save