Merge pull request #835 from ansible/jw/consol2

consolidate launch-wisdom.sh and launch-wisdom-compose.sh
ansible · Feb 26, 2024 · 21733c0 · 21733c0 · github-actions · Feb 26, 2024
2 parents aad2b03 + 69e7b63
commit 21733c0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/tools/docker-compose/compose.yaml b/tools/docker-compose/compose.yaml
@@ -76,7 +76,7 @@ services:
       - ANSIBLE_WCA_HEALTHCHECK_MODEL_ID=${ANSIBLE_WCA_HEALTHCHECK_MODEL_ID}
       - DEPLOYMENT_MODE=${DEPLOYMENT_MODE}
     command:
-      - /etc/wisdom/scripts/launch-wisdom-compose.sh
+      - /etc/wisdom/scripts/launch-wisdom.sh
     networks:
       - dbnet
   db:

diff --git a/tools/scripts/launch-wisdom-compose.sh b/tools/scripts/launch-wisdom-compose.sh
diff --git a/tools/scripts/launch-wisdom.sh b/tools/scripts/launch-wisdom.sh
@@ -30,6 +30,9 @@ if [ "${DEPLOYMENT_MODE}" == "upstream" ]; then
     echo "Creating a testing user for upstream mode..."
     /var/www/venv/bin/python ansible_wisdom/manage.py createtoken --username testuser --password testuser --token-name testuser_token --create-user
 fi
+if [ ! "${DEPLOYMENT_MODE}" == "saas" ]; then
+    /var/www/venv/bin/wisdom-manage createapplication --name "Ansible Lightspeed for VS Code" --client-id Vu2gClkeR5qUJTUGHoFAePmBznd6RZjDdy5FW2wy --redirect-uris "vscode://redhat.ansible vscodium://redhat.ansible vscode-insiders://redhat.ansible code-oss://redhat.ansible checode://redhat.ansible" public authorization-code
+fi
 /var/www/venv/bin/wisdom-manage collectstatic --noinput
 
 /usr/local/bin/supervisord -n