Add launcher_catalog_filter to launcher role (#57)

Fixes: #54
snowdrop · Apr 30, 2018 · 7e82244 · 7e82244
1 parent 1498d83
commit 7e82244
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/ansible/README-post-installation.md b/ansible/README-post-installation.md
@@ -160,6 +160,7 @@ ansible-playbook -i inventory/cloud_host playbook/post_installation.yml -e opens
 | launcher_template_url | The launcher template URL | https://raw.githubusercontent.com/fabric8-launcher/launcher-openshift-templates/master/openshift/launcher-template.yaml |  
 | 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_keycloak_template_name | The project where the launcher will be installed | devex |  
 

diff --git a/ansible/playbook/roles/launcher/defaults/main.yml b/ansible/playbook/roles/launcher/defaults/main.yml
@@ -25,4 +25,5 @@ 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_keycloak_template_name: launcher-keycloak
+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
@@ -23,6 +23,7 @@
       - "Parameters used to create the application from the template : "
       - "LAUNCHER_BOOSTER_CATALOG_REPOSITORY={{ launcher_catalog_git_repo }}"
       - "LAUNCHER_BOOSTER_CATALOG_REF={{ launcher_catalog_git_branch }}"
+      - "LAUNCHER_BOOSTER_CATALOG_FILTER={{ launcher_catalog_filter }}"
       - "LAUNCHER_KEYCLOAK_URL={{ launcher_keycloak_url }}"
       - "LAUNCHER_KEYCLOAK_REALM={{ launcher_keycloak_realm }}"
       - "LAUNCHER_MISSIONCONTROL_OPENSHIFT_USERNAME={{ launcher_openshift_user }}"
@@ -37,6 +38,7 @@
     oc new-app {{ launcher_template_name }}  -n {{ launcher_project_name }} \
         -p LAUNCHER_BOOSTER_CATALOG_REPOSITORY={{ launcher_catalog_git_repo }} \
         -p LAUNCHER_BOOSTER_CATALOG_REF={{ launcher_catalog_git_branch }} \
+        -p LAUNCHER_BOOSTER_CATALOG_FILTER={{ launcher_catalog_filter }} \
         -p LAUNCHER_KEYCLOAK_URL={{ launcher_keycloak_url }} \
         -p LAUNCHER_KEYCLOAK_REALM={{ launcher_keycloak_realm }} \
         -p LAUNCHER_MISSIONCONTROL_OPENSHIFT_USERNAME={{ launcher_openshift_user }} \