honghuac
2018-09-14 7e65e241505d4b455f3b8925faa38f258efafcfb
Updated workload ocp-workload-rhte-mw-api-biz - updated variables for APICurio and Microcks in main.yml - AAD Development Branch
3 files modified
24 ■■■■■ changed files
ansible/roles/ocp-workload-3scale-lifecycle/defaults/main.yml 14 ●●●● patch | view | raw | blame | history
ansible/roles/ocp-workload-rhte-mw-api-biz/defaults/main.yml 2 ●●●●● patch | view | raw | blame | history
ansible/roles/ocp-workload-rhte-mw-api-biz/tasks/workload.yml 8 ●●●● patch | view | raw | blame | history
ansible/roles/ocp-workload-3scale-lifecycle/defaults/main.yml
@@ -31,15 +31,9 @@
APICURIO_API_ROUTE: apicurio-studio-api.$OCP_SUFFIX
APICURIO_WS_ROUTE: apicurio-studio-ws.$OCP_SUFFIX
MICROCKS_ROUTE_HOSTNAME: microcks.$OCP_SUFFIX
APICURIO_UI_ROUTE=apicurio-studio.$OCP_SUFFIX
APICURIO_API_ROUTE=apicurio-studio-api.$OCP_SUFFIX
APICURIO_WS_ROUTE=apicurio-studio-ws.$OCP_SUFFIX
MICROCKS_ROUTE_HOSTNAME=microcks.$OCP_SUFFIX
OPENSHIFT_OAUTH_CLIENT_NAME=laboauth
SSO_HOSTNAME_HTTP=sso-unsecured.$OCP_SUFFIX
SSO_HOSTNAME_HTTPS=sso.$OCP_SUFFIX
KEYCLOAK_ROUTE_HOSTNAME=http://$SSO_HOSTNAME_HTTP/auth
OPENSHIFT_OAUTH_CLIENT_NAME: laboauth
SSO_HOSTNAME_HTTP: sso-unsecured.$OCP_SUFFIX
SSO_HOSTNAME_HTTPS: sso.$OCP_SUFFIX
KEYCLOAK_ROUTE_HOSTNAME: http://$SSO_HOSTNAME_HTTP/auth
apibiz_url: https://raw.githubusercontent.com/gpe-mw-training/rhte-api-as-business-labs/master/templates
ansible/roles/ocp-workload-rhte-mw-api-biz/defaults/main.yml
@@ -28,6 +28,8 @@
deploy_status_retries: 15
deploy_status_delay: 20
APPLICATION_NAME: "quoting"
rhdm_template_yml: "https://raw.githubusercontent.com/jboss-container-images/rhdm-7-openshift-image/7.0.x/rhdm70-image-streams.yaml"
nodejs_template_yml: "https://raw.githubusercontent.com/gpe-mw-training/rhte-api-as-business-labs/master/templates/nodejs-quoting-app-template.json"
ansible/roles/ocp-workload-rhte-mw-api-biz/tasks/workload.yml
@@ -29,7 +29,7 @@
  changed_when: false
- name: "Create project {{rhdm_ocp_project}}"
  shell: "oc new-project {{rhdm_ocp_project}} --display-name={{rhdm_ocp_project}}"
  shell: "oc new-project {{rhdm_ocp_project}} --display-name={{rhdm_ocp_project}}" --description="Insurance Quote Rules engine decision manager."
  when: rhdm_project_result has failed
- name: "Label namespace"
@@ -54,10 +54,6 @@
- name: Create Template for {{rhdm_ocp_project}}
  shell: oc create -f {{rhdm_template_yml}} -n openshift
  when: rhdm_project_result has failed
- name: Create project 'rhdm'
  shell: oc adm new-project rhdm --admin=opentlc-mgr --description="Insurance Quote Rules engine decision manager."
  when: rhdm_project_result has failed
- name: Create project 'rhdm'
@@ -224,7 +220,7 @@
  when: nodejs_project_result has failed
#- name: Create NodeJS project
#  shell: oc adm new-project $tenantId-nodejs --admin=$tenantId  --description=$tenantId
#  shell: oc adm new-project $tenantId-nodejs --admin=$tenantId  --description=$tenantId
- name: "Label namespace"
  command: "oc label namespace {{nodejs_ocp_project}} AAD='{{guid}}'"