Merge pull request #60 from snowdrop/launcher

Launcher improvements
snowdrop · May 3, 2018 · ea95689 · ea95689
2 parents 7e82244 + 13d37ee
commit ea95689
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 26 deletions.
diff --git a/ansible/README-post-installation.md b/ansible/README-post-installation.md
@@ -161,7 +161,8 @@ ansible-playbook -i inventory/cloud_host playbook/post_installation.yml -e opens
 | launcher_catalog_git_repo | Git Repo where the catalog is defined | https://github.com/fabric8-launcher/launcher-booster-catalog.git |  
 | launcher_catalog_git_branch | Git branch where the catalog is defined | master |  
 | launcher_catalog_filter | The filter used to limit which catalog entries will appear |  |  
-| launcher_openshift_console_url | The URL where the Openshift console is accessible | https://192.168.99.50:8443/ |  
+| launcher_openshift_console_url | The URL where the Openshift console is accessible | Looked up automatically using `oc` |  
+| launcher_openshift_api_url | The URL of the Openshift API | https://openshift.default.svc.cluster.local |  
 | launcher_keycloak_template_name | The project where the launcher will be installed | devex |  
 
 ### Command install_oc

diff --git a/ansible/playbook/post_installation.yml b/ansible/playbook/post_installation.yml
@@ -22,4 +22,3 @@
     # Launcher Role
     - {name: "Install launcher                 ", import_role: {name: launcher, tasks_from: install.yml},         tags: [install-launcher]}
     - {name: "Uninstall launcher               ", import_role: {name: launcher, tasks_from: uninstall.yml},       tags: [uninstall-launcher]}
-    - {name: "Patch launcher-clusters configmap", import_role: {name: launcher, tasks_from: patch_configmap.yml}, tags: [uninstall-launcher]}
diff --git a/ansible/playbook/roles/launcher/defaults/main.yml b/ansible/playbook/roles/launcher/defaults/main.yml
@@ -20,10 +20,8 @@ launcher_template_url: https://raw.githubusercontent.com/fabric8-launcher/launch
 launcher_catalog_git_repo: https://github.com/fabric8-launcher/launcher-booster-catalog.git
 launcher_catalog_git_branch: master
 
-launcher_openshift_console_url: https://192.168.99.50:8443/
-
-# Address used to configure the endpoint of the launcher-cluster configMAps
-launcher_openshift_consoleUrl: https://192.168.99.50:8443/
+launcher_openshift_console_url:
+launcher_openshift_api_url: https://openshift.default.svc.cluster.local
 
 launcher_keycloak_template_name: launcher-keycloak
 launcher_catalog_filter: 
diff --git a/ansible/playbook/roles/launcher/tasks/install.yml b/ansible/playbook/roles/launcher/tasks/install.yml
@@ -12,6 +12,17 @@
   register: r_get_template
   ignore_errors: true
 
+- block:
+
+  - name: Get openshift URL
+    command: oc whoami --show-server
+    register: openshift_url
+
+  - set_fact:
+      launcher_openshift_console_url: "{{ openshift_url.stdout }}"
+
+  when: "not launcher_openshift_console_url == ''"
+
 - name: Deploy the Launcher template
   command: oc create -n {{ launcher_project_name }} -f https://raw.githubusercontent.com/fabric8-launcher/launcher-openshift-templates/{{ launcher_template_version }}/openshift/launcher-template.yaml
   when: r_get_template.stdout == ""
@@ -29,7 +40,7 @@
       - "LAUNCHER_MISSIONCONTROL_OPENSHIFT_USERNAME={{ launcher_openshift_user }}"
       - "LAUNCHER_MISSIONCONTROL_OPENSHIFT_PASSWORD={{ launcher_openshift_pwd }}"
       - "LAUNCHER_MISSIONCONTROL_OPENSHIFT_CONSOLE_URL={{ launcher_openshift_console_url }}"
-      - "LAUNCHER_MISSIONCONTROL_OPENSHIFT_API_URL={{ launcher_openshift_console_url }}"
+      - "LAUNCHER_MISSIONCONTROL_OPENSHIFT_API_URL={{ launcher_openshift_api_url }}"
       - "LAUNCHER_MISSIONCONTROL_GITHUB_USERNAME={{ launcher_github_username }}"
       - "LAUNCHER_MISSIONCONTROL_GITHUB_TOKEN={{ launcher_github_token }}"
 
@@ -44,6 +55,6 @@
         -p LAUNCHER_MISSIONCONTROL_OPENSHIFT_USERNAME={{ launcher_openshift_user }} \
         -p LAUNCHER_MISSIONCONTROL_OPENSHIFT_PASSWORD={{ launcher_openshift_pwd }} \
         -p LAUNCHER_MISSIONCONTROL_OPENSHIFT_CONSOLE_URL={{ launcher_openshift_console_url }} \
-        -p LAUNCHER_MISSIONCONTROL_OPENSHIFT_API_URL={{ launcher_openshift_console_url }} \
+        -p LAUNCHER_MISSIONCONTROL_OPENSHIFT_API_URL={{ launcher_openshift_api_url }} \
         -p LAUNCHER_MISSIONCONTROL_GITHUB_USERNAME={{ launcher_github_username }} \
         -p LAUNCHER_MISSIONCONTROL_GITHUB_TOKEN={{ launcher_github_token }}
diff --git a/ansible/playbook/roles/launcher/tasks/keycloak.yml b/ansible/playbook/roles/launcher/tasks/keycloak.yml
diff --git a/ansible/playbook/roles/launcher/tasks/patch_configmap.yml b/ansible/playbook/roles/launcher/tasks/patch_configmap.yml