diff --git a/packaging/packer/ansible/templates/docker-compose.yml.j2 b/packaging/packer/ansible/templates/docker-compose.yml.j2 index 1d37481079..ca3db663b2 100644 --- a/packaging/packer/ansible/templates/docker-compose.yml.j2 +++ b/packaging/packer/ansible/templates/docker-compose.yml.j2 @@ -12,7 +12,6 @@ services: - GF_SECURITY_ADMIN_USER={{ GRAFANA_LOGIN }} - GF_SECURITY_ADMIN_PASSWORD={{ GRAFANA_PASSWORD }} - GF_USERS_ALLOW_SIGN_UP=false - - GF_SERVER_ROOT_URL={{ GRAFANA_ROOT_URL }} - GF_SERVER_SERVE_FROM_SUB_PATH=true - GF_PANELS_DISABLE_SANITIZE_HTML=true ports: diff --git a/packaging/packer/ubuntu.pkr.hcl b/packaging/packer/ubuntu.pkr.hcl index 7a65a89ef7..ddbbc884f9 100644 --- a/packaging/packer/ubuntu.pkr.hcl +++ b/packaging/packer/ubuntu.pkr.hcl @@ -98,6 +98,11 @@ build { "ANSIBLE_HOST_KEY_CHECKING=False" ] + extra_arguments = [ + "-e", "GRAFANA_LOGIN=admin", + "-e", "GRAFANA_PASSWORD=admin", + ] + galaxy_command = "./ansible-galaxy.sh" galaxy_file = "${path.cwd}/ansible/requirements.yml" }