5 Commits

Author SHA1 Message Date
Manuel Romero
f8fc2b06b5 fix 2022-04-28 11:00:25 +02:00
Manuel Romero
2d09ea84dc fix 2022-04-28 10:59:10 +02:00
Manuel Romero
8221c18302 remove no needed stuff 2022-04-28 10:54:05 +02:00
Manuel Romero
3a07cc55f3 fixes 2022-04-28 10:43:38 +02:00
Manuel Romero
df7877c42c feb22 files 2022-04-28 09:59:05 +02:00
3 changed files with 56 additions and 17 deletions

View File

@@ -73,21 +73,6 @@ resource "azurerm_linux_virtual_machine" "vm" {
"StartupTime": var.is_24x7 == false? var.startupTime : null
}
provisioner "remote-exec" {
connection {
type = "ssh"
host = module.qmi-nic.private_ip_address
user = local.admin_username
password = local.admin_password
timeout = "3m"
#private_key = "${file("~/.ssh/id_rsa")}"
}
inline = [
"echo 'HOLA'",
]
}
provisioner "file" {
connection {
type = "ssh"
@@ -117,6 +102,7 @@ resource "azurerm_linux_virtual_machine" "vm" {
"sudo /home/${local.admin_username}/scripts/feb2021/core_env_setup.sh",
"sudo /home/${local.admin_username}/scripts/feb2021/set-license.sh '${data.azurerm_key_vault_secret.license-sept20.value}'"
]
}
}

View File

@@ -2,8 +2,10 @@
echo "--- Start qdc-nextgen-xml.sh $1"
echo "$2"
TOMCAT_HOME="/usr/local/qdc/apache-tomcat-9.0.38"
hostname=`hostname | cut -d"." -f1`
BASEQDC="/usr/local/qdc"
TOMCAT=$(ls -la $BASEQDC | grep apache-tomcat | grep '^d'| awk -F " " '{print $9}')
TOMCAT_HOME=$BASEQDC/$TOMCAT
BASEDIR=$(dirname "$0")
if [[ $2 == *"4.9.0"* ]]; then
@@ -11,11 +13,15 @@ if [[ $2 == *"4.9.0"* ]]; then
fi
sudo cp /home/qmi/scripts/wildcard_qmi_qlik-poc_com.pfx /usr/local/qdc
sudo cp /tmp/podium/config/qlikContainers.service /etc/systemd/system/
sudo systemctl daemon-reload
sudo systemctl enable qlikContainers.service
FILE=/usr/local/qdc/qlikcore/docker-compose-qlikContainers.yml
if [ -f "$FILE" ]; then
sudo cp /home/qmi/scripts/feb2022/docker-compose-qlikContainers.yml /usr/local/qdc/qlikcore/docker-compose-qlikContainers.yml
sudo systemctl daemon-reload
sudo service containerd restart
sudo service docker stop

View File

@@ -0,0 +1,47 @@
version: "3.0"
services:
licenses:
image: qliktech-docker-release.jfrog.io/licenses:3.35.0
container_name: licenses
hostname: licenses
networks:
- qdc
ports:
- 9200:9200
environment:
- QLIK_CATALOG_MODE=true
- LOG_LEVEL=debug
- LICENSES_CONNECTION_STRING=host= port=5432 user=licenses password=licenses dbname=licenses sslmode=disable
- PERSISTENCE_CONNECT_DURATION=60s
#- OFFLINE=true
#- PROXY_URI=<proxy-server-address>
qix-engine:
# 88c1b341af2a = qliktech-docker-experimental.jfrog.io/engine:qdc-qlik-core
# 60c963ecd624 = qliktech-docker-experimental.jfrog.io/engine:qdc-qlik-core-feb-2020
# 170fc8740f04 = qliktech-docker-release.jfrog.io/engine:12.722.0
image: qliktech-docker-release.jfrog.io/engine:12.722.0
command: -S AcceptEULA=yes -S LicenseServiceUrl=http://licenses:9200 -S TrafficLogVerbosity=5 -S SystemLogVerbosity=5 -S ScriptLogVerbosity=5
networks:
- qdc
ports:
- 19076:9076
- 9090:9090
volumes:
# On Linux, uncomment only volume containing qdc_host_root (this is default)
- /:/qdc_host_root
# On MacOS (possibly other OS as well), uncomment only volumes containing qlik-core-input and qlik-core-output
# - /tmp:/qlik-core-input
# - /tmp:/qlik-core-output
user: ${QLIKCORE_UID}:${QLIKCORE_GID}
labels:
qix-engine: ""
networks:
qdc:
driver: bridge
ipam:
config:
- subnet: 172.60.0.0/16