diff options
| author | Tim Flink <tflink@fedoraproject.org> | 2017-08-31 14:44:24 +0000 |
|---|---|---|
| committer | Tim Flink <tflink@fedoraproject.org> | 2017-08-31 14:44:24 +0000 |
| commit | d1a86269b931737a98266b04c2353bb7a43d1232 (patch) | |
| tree | 9718b1a2eba074572553357b445d7a3d74a66a35 | |
| parent | e7e9c317acfbc7c431637c5f9b8b929a7bb6d199 (diff) | |
| download | ansible-d1a86269b931737a98266b04c2353bb7a43d1232.tar.gz ansible-d1a86269b931737a98266b04c2353bb7a43d1232.tar.xz ansible-d1a86269b931737a98266b04c2353bb7a43d1232.zip | |
changing ufmonitor to not use public ip for db connection
| -rw-r--r-- | roles/ufmonitor/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/ufmonitor/templates/ufmonitor-apiserver.service.j2 | 2 | ||||
| -rw-r--r-- | roles/ufmonitor/templates/update-ufmonitor.j2 | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/roles/ufmonitor/defaults/main.yml b/roles/ufmonitor/defaults/main.yml index 4bdb3591e..5fe14af54 100644 --- a/roles/ufmonitor/defaults/main.yml +++ b/roles/ufmonitor/defaults/main.yml @@ -1,5 +1,6 @@ apiserver_container_image: "docker.io/fedoraqa/ufmonitor-apiserver:latest" updater_container_image: "docker.io/fedoraqa/ufmonitor-updater:latest" +ufmonitor_db_host: "172.17.0.1" ufmonitor_db_name: "ufmonitor" ufmonitor_db_user: "ufmonitor" ufmonitor_db_password: "terribleinsecurepassword" diff --git a/roles/ufmonitor/templates/ufmonitor-apiserver.service.j2 b/roles/ufmonitor/templates/ufmonitor-apiserver.service.j2 index 6f33f71cb..5796c6101 100644 --- a/roles/ufmonitor/templates/ufmonitor-apiserver.service.j2 +++ b/roles/ufmonitor/templates/ufmonitor-apiserver.service.j2 @@ -8,7 +8,7 @@ TimeoutStartSec=0 Type=oneshot RemainAfterExit=yes 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 TimeoutStopSec=180 diff --git a/roles/ufmonitor/templates/update-ufmonitor.j2 b/roles/ufmonitor/templates/update-ufmonitor.j2 index 01a5236aa..855ca7bfc 100644 --- a/roles/ufmonitor/templates/update-ufmonitor.j2 +++ b/roles/ufmonitor/templates/update-ufmonitor.j2 @@ -5,4 +5,4 @@ # 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 |