diff options
Diffstat (limited to 'salt')
13 files changed, 62 insertions, 20 deletions
diff --git a/salt/openbook/admin_api_server/files/installdeps.sh b/salt/openbook/admin_api_server/files/installdeps.sh index a4ac323..fae7690 100644 --- a/salt/openbook/admin_api_server/files/installdeps.sh +++ b/salt/openbook/admin_api_server/files/installdeps.sh @@ -5,9 +5,15 @@ apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" curl python openjdk-8-jre-headless +current_jar=($(curl -s \ + -k \ + -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ + {{ pillar["jars"]["url"] }} \ + | grep -o -P '{{ pillar["admin_api_server"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ - -o "{{ pillar["admin_api_server"]["jar_name"] }}" \ - "{{ pillar["jars"]["url"] }}/{{ pillar["admin_api_server"]["jar_name"] }}" + -o ${current_jar[0]} \ + {{ pillar["jars"]["url"] }}/${current_jar[0]} exit 0 diff --git a/salt/openbook/admin_api_server/files/start_app.sh b/salt/openbook/admin_api_server/files/start_app.sh index d610377..9ebfc47 100644 --- a/salt/openbook/admin_api_server/files/start_app.sh +++ b/salt/openbook/admin_api_server/files/start_app.sh @@ -1,3 +1,4 @@ #!/bin/bash -exec java -jar {{ pillar["admin_api_server"]["jar_name"] }} run com.talligent.openbook.verticle.Startup --cluster +jar=$(find -maxdepth 1 -type f -name '{{ pillar["admin_api_server"]["jar_name"] }}*' | awk -F/ '{print $2}') +exec java -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster diff --git a/salt/openbook/admin_web_ui/files/installdeps.sh b/salt/openbook/admin_web_ui/files/installdeps.sh index 807b0f7..d52a202 100644 --- a/salt/openbook/admin_web_ui/files/installdeps.sh +++ b/salt/openbook/admin_web_ui/files/installdeps.sh @@ -5,9 +5,15 @@ apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" curl python openjdk-8-jre-headless +current_jar=($(curl -s \ + -k \ + -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ + {{ pillar["jars"]["url"] }} \ + | grep -o -P '{{ pillar["admin_web_ui"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ - -o "{{ pillar["admin_web_ui"]["jar_name"] }}" \ - "{{ pillar["jars"]["url"] }}/{{ pillar["admin_web_ui"]["jar_name"] }}" + -o ${current_jar[0]} \ + {{ pillar["jars"]["url"] }}/${current_jar[0]} exit 0 diff --git a/salt/openbook/admin_web_ui/files/start_app.sh b/salt/openbook/admin_web_ui/files/start_app.sh index 86daad4..a96ea87 100644 --- a/salt/openbook/admin_web_ui/files/start_app.sh +++ b/salt/openbook/admin_web_ui/files/start_app.sh @@ -1,3 +1,4 @@ #!/bin/bash -exec java -jar {{ pillar["admin_web_ui"]["jar_name"] }} run com.talligent.openbook.verticle.Startup --cluster +jar=$(find -maxdepth 1 -type f -name '{{ pillar["admin_web_ui"]["jar_name"] }}*' | awk -F/ '{print $2}') +exec java -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster diff --git a/salt/openbook/ansible/files/deploy-branch.sh b/salt/openbook/ansible/files/deploy-branch.sh index 59ba614..2af4340 100644 --- a/salt/openbook/ansible/files/deploy-branch.sh +++ b/salt/openbook/ansible/files/deploy-branch.sh @@ -1,6 +1,6 @@ #!/bin/bash -env="${1}" +branch="${1}" buildroot="$(pwd)" pushd ${buildroot}/conf @@ -9,5 +9,5 @@ rm -f env.yaml ln -s env.yaml.openbook env.yaml popd pushd ${buildroot} -ansible-playbook -i inventory_json_${env}.rb openbook_installer.yaml +ansible-playbook -i inventory_json_${branch}.rb openbook_installer.yaml popd diff --git a/salt/openbook/customer_api_server/files/installdeps.sh b/salt/openbook/customer_api_server/files/installdeps.sh index d14d7a2..3a4f2fa 100644 --- a/salt/openbook/customer_api_server/files/installdeps.sh +++ b/salt/openbook/customer_api_server/files/installdeps.sh @@ -5,9 +5,15 @@ apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" curl python openjdk-8-jre-headless +current_jar=($(curl -s \ + -k \ + -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ + {{ pillar["jars"]["url"] }} \ + | grep -o -P '{{ pillar["customer_api_server"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ - -o "{{ pillar["customer_api_server"]["jar_name"] }}" \ - "{{ pillar["jars"]["url"] }}/{{ pillar["customer_api_server"]["jar_name"] }}" + -o ${current_jar[0]} \ + {{ pillar["jars"]["url"] }}/${current_jar[0]} exit 0 diff --git a/salt/openbook/customer_api_server/files/start_app.sh b/salt/openbook/customer_api_server/files/start_app.sh index 6fd1f62..e18cbe3 100644 --- a/salt/openbook/customer_api_server/files/start_app.sh +++ b/salt/openbook/customer_api_server/files/start_app.sh @@ -1,3 +1,4 @@ #!/bin/bash -exec java -jar {{ pillar["customer_api_server"]["jar_name"] }} run com.talligent.openbook.verticle.Startup --cluster +jar=$(find -maxdepth 1 -type f -name '{{ pillar["customer_api_server"]["jar_name"] }}*' | awk -F/ '{print $2}') +exec java -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster diff --git a/salt/openbook/customer_web_ui/files/installdeps.sh b/salt/openbook/customer_web_ui/files/installdeps.sh index e1a5532..9c96042 100644 --- a/salt/openbook/customer_web_ui/files/installdeps.sh +++ b/salt/openbook/customer_web_ui/files/installdeps.sh @@ -5,9 +5,15 @@ apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" curl python openjdk-8-jre-headless +current_jar=($(curl -s \ + -k \ + -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ + {{ pillar["jars"]["url"] }} \ + | grep -o -P '{{ pillar["customer_web_ui"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ - -o "{{ pillar["customer_web_ui"]["jar_name"] }}" \ - "{{ pillar["jars"]["url"] }}/{{ pillar["customer_web_ui"]["jar_name"] }}" + -o ${current_jar[0]} \ + {{ pillar["jars"]["url"] }}/${current_jar[0]} exit 0 diff --git a/salt/openbook/customer_web_ui/files/start_app.sh b/salt/openbook/customer_web_ui/files/start_app.sh index 7f24089..ff75879 100644 --- a/salt/openbook/customer_web_ui/files/start_app.sh +++ b/salt/openbook/customer_web_ui/files/start_app.sh @@ -1,3 +1,4 @@ #!/bin/bash -exec java -jar {{ pillar["customer_web_ui"]["jar_name"] }} run com.talligent.openbook.verticle.Startup --cluster +jar=$(find -maxdepth 1 -type f -name '{{ pillar["customer_web_ui"]["jar_name"] }}*' | awk -F/ '{print $2}') +exec java -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster diff --git a/salt/openbook/job_scheduler_server/files/installdeps.sh b/salt/openbook/job_scheduler_server/files/installdeps.sh index 64ba328..dfe4522 100644 --- a/salt/openbook/job_scheduler_server/files/installdeps.sh +++ b/salt/openbook/job_scheduler_server/files/installdeps.sh @@ -5,9 +5,15 @@ apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" curl python openjdk-8-jre-headless +current_jar=($(curl -s \ + -k \ + -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ + {{ pillar["jars"]["url"] }} \ + | grep -o -P '{{ pillar["job_scheduler_server"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ - -o "{{ pillar["job_scheduler_server"]["jar_name"] }}" \ - "{{ pillar["jars"]["url"] }}/{{ pillar["job_scheduler_server"]["jar_name"] }}" + -o ${current_jar[0]} \ + {{ pillar["jars"]["url"] }}/${current_jar[0]} exit 0 diff --git a/salt/openbook/job_scheduler_server/files/start_app.sh b/salt/openbook/job_scheduler_server/files/start_app.sh index 9a7dbf4..87dc22a 100644 --- a/salt/openbook/job_scheduler_server/files/start_app.sh +++ b/salt/openbook/job_scheduler_server/files/start_app.sh @@ -1,3 +1,4 @@ #!/bin/bash -exec java -jar {{ pillar["job_scheduler_server"]["jar_name"] }} run com.talligent.openbook.verticle.Startup --cluster +jar=$(find -maxdepth 1 -type f -name '{{ pillar["job_scheduler_server"]["jar_name"] }}*' | awk -F/ '{print $2}') +exec java -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster diff --git a/salt/openbook/workflow_server/files/installdeps.sh b/salt/openbook/workflow_server/files/installdeps.sh index 2bba1b0..a90c3c9 100644 --- a/salt/openbook/workflow_server/files/installdeps.sh +++ b/salt/openbook/workflow_server/files/installdeps.sh @@ -5,9 +5,15 @@ apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" curl python openjdk-8-jre-headless +current_jar=($(curl -s \ + -k \ + -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ + {{ pillar["jars"]["url"] }} \ + | grep -o -P '{{ pillar["workflow_server"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ - -o "{{ pillar["workflow_server"]["jar_name"] }}" \ - "{{ pillar["jars"]["url"] }}/{{ pillar["workflow_server"]["jar_name"] }}" + -o ${current_jar[0]} \ + {{ pillar["jars"]["url"] }}/${current_jar[0]} exit 0 diff --git a/salt/openbook/workflow_server/files/start_app.sh b/salt/openbook/workflow_server/files/start_app.sh index 3324f4f..5a865ff 100644 --- a/salt/openbook/workflow_server/files/start_app.sh +++ b/salt/openbook/workflow_server/files/start_app.sh @@ -1,3 +1,4 @@ #!/bin/bash -exec java -jar {{ pillar["workflow_server"]["jar_name"] }} run com.talligent.openbook.verticle.Startup --cluster +jar=$(find -maxdepth 1 -type f -name '{{ pillar["workflow_server"]["jar_name"] }}*' | awk -F/ '{print $2}') +exec java -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster |