diff --git a/inventory/host_vars/pdc.fedorainfracloud.org b/inventory/host_vars/pdc.fedorainfracloud.org index c83a7b7672..57782d7902 100644 --- a/inventory/host_vars/pdc.fedorainfracloud.org +++ b/inventory/host_vars/pdc.fedorainfracloud.org @@ -9,6 +9,7 @@ tcp_ports: [22, 80, 443] inventory_tenant: persistent inventory_instance_name: pdc hostbase: pdc.fedorainfracloud.org +hostname: pdc.fedorainfracloud.org public_ip: 209.132.184.106 root_auth_users: pingou description: pdc development instance diff --git a/roles/pdc/templates/pdc.conf b/roles/pdc/templates/pdc.conf index 8c3461bd3a..edc66192e9 100644 --- a/roles/pdc/templates/pdc.conf +++ b/roles/pdc/templates/pdc.conf @@ -2,8 +2,8 @@ WSGISocketPrefix /var/run/wsgi WSGIPythonOptimize 1 WSGIDaemonProcess pdc user=apache group=apache maximum-requests=1000 display-name=pdc processes=2 threads=1 shutdown-timeout=10 - - ServerName {{ hostbase }} + + ServerName {{ hostname }} CustomLog /var/log/httpd/pdc-access.log combined ErrorLog /var/log/httpd/pdc-error.log diff --git a/roles/pdc/templates/settings_local.py b/roles/pdc/templates/settings_local.py index 6af9c57ae8..52db2fa455 100644 --- a/roles/pdc/templates/settings_local.py +++ b/roles/pdc/templates/settings_local.py @@ -84,7 +84,7 @@ REST_API_VERSION = 'v1' BROWSABLE_DOCUMENT_MACROS = { # need to be rewrite with the real host name when deploy. - 'HOST_NAME': 'http://{{ hostbase }}:80', + 'HOST_NAME': 'http://{{ hostname }}:80', # make consistent with rest api root. 'API_PATH': '%s%s' % (REST_API_URL, REST_API_VERSION), }