Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

changing ufmonitor to not use public ip for db connection

Browse source
This commit is contained in:
Tim Flink 2017-08-31 14:44:24 +00:00
parent e7e9c317ac
commit d1a86269b9
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
roles/ufmonitor/defaults/main.yml
View file

@ -1,5 +1,6 @@
apiserver_container_image: "docker.io/fedoraqa/ufmonitor-apiserver:latest" apiserver_container_image: "docker.io/fedoraqa/ufmonitor-apiserver:latest"
updater_container_image: "docker.io/fedoraqa/ufmonitor-updater:latest" updater_container_image: "docker.io/fedoraqa/ufmonitor-updater:latest"
ufmonitor_db_host: "172.17.0.1"
ufmonitor_db_name: "ufmonitor" ufmonitor_db_name: "ufmonitor"
ufmonitor_db_user: "ufmonitor" ufmonitor_db_user: "ufmonitor"
ufmonitor_db_password: "terribleinsecurepassword" ufmonitor_db_password: "terribleinsecurepassword"

2
roles/ufmonitor/templates/ufmonitor-apiserver.service.j2
View file

@ -8,7 +8,7 @@ TimeoutStartSec=0
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
EnvironmentFile=-{{ ufmonitor_config_path }} EnvironmentFile=-{{ ufmonitor_config_path }}
ExecStart=/usr/bin/docker run --detach --log-driver none --name %n -p 8000:8000 -e POSTGRES_DB_PASSWORD={{ ufmonitor_db_password }} --add-host=postgres:{{ public_ip }} {{ apiserver_container_image }} ExecStart=/usr/bin/docker run --detach --log-driver none --name %n -p 8000:8000 -e POSTGRES_DB_PASSWORD={{ ufmonitor_db_password }} --add-host=postgres:{{ ufmonitor_db_host }} {{ apiserver_container_image }}
ExecStop=/usr/bin/docker rm --force %n ExecStop=/usr/bin/docker rm --force %n
TimeoutStopSec=180 TimeoutStopSec=180

2
roles/ufmonitor/templates/update-ufmonitor.j2
View file

@ -5,4 +5,4 @@
# #
source {{ ufmonitor_config_path }} source {{ ufmonitor_config_path }}
docker run --add-host=postgres:{{ public_ip }} {{ updater_container_image }} -l /var/log/ufmonitor/updater.log docker run --add-host=postgres:{{ ufmonitor_db_host}} {{ updater_container_image }} -l /var/log/ufmonitor/updater.log