diff options
| -rw-r--r-- | inventory/host_vars/upstreamfirst.fedorainfracloud.org | 10 | ||||
| -rw-r--r-- | roles/ufmonitor/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/ufmonitor/templates/ufmonitor-envvars.j2 | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/inventory/host_vars/upstreamfirst.fedorainfracloud.org b/inventory/host_vars/upstreamfirst.fedorainfracloud.org index 99f6752b6..e5d172557 100644 --- a/inventory/host_vars/upstreamfirst.fedorainfracloud.org +++ b/inventory/host_vars/upstreamfirst.fedorainfracloud.org @@ -60,6 +60,16 @@ host_backup_targets: shared_buffers: "2GB" effective_cache_size: "6GB" +############################################################ +# ufmonitor config +############################################################ +# +ufmonitor_db_host: "172.17.0.1" +ufmonitor_db_name: "ufmonitor" +ufmonitor_db_user: "ufmonitor" +ufmonitor_db_password: "{{ upstreamfirst_ufmonitor_db_pass }}" +ufmonitor_config_path: "/etc/sysconfig/ufmonitor" +ufmonitor_home: "/var/www/ufmonitor" ############################################################ # Pagure Config diff --git a/roles/ufmonitor/tasks/main.yml b/roles/ufmonitor/tasks/main.yml index 04f633341..8f8ec7d2f 100644 --- a/roles/ufmonitor/tasks/main.yml +++ b/roles/ufmonitor/tasks/main.yml @@ -31,9 +31,6 @@ become_user: postgres postgresql_user: db={{ ufmonitor_db_name }} user={{ ufmonitor_db_user }} password={{ ufmonitor_db_password }} role_attr_flags=NOSUPERUSER -- name: generate environment file for apiserver - template: src=ufmonitor-envvars.j2 dest=/etc/sysconfig/ufmonitor - - name: Deploy service file for apiserver template: src=ufmonitor-apiserver.service.j2 dest=/etc/systemd/system/ufmonitor-apiserver.service notify: diff --git a/roles/ufmonitor/templates/ufmonitor-envvars.j2 b/roles/ufmonitor/templates/ufmonitor-envvars.j2 deleted file mode 100644 index c87e90a69..000000000 --- a/roles/ufmonitor/templates/ufmonitor-envvars.j2 +++ /dev/null @@ -1 +0,0 @@ -POSTGRES_DB_PASSWORD='{{ ufmonitor_db_password }}' |