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

Add a new hostname variable for pdc

Browse source
This commit is contained in:
Pierre-Yves Chibon 2015-09-30 09:01:56 +02:00
parent 262f5b125b
commit 12c2e0f6ff
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/host_vars/pdc.fedorainfracloud.org
View file

@ -9,6 +9,7 @@ tcp_ports: [22, 80, 443]
inventory_tenant: persistent inventory_tenant: persistent
inventory_instance_name: pdc inventory_instance_name: pdc
hostbase: pdc.fedorainfracloud.org hostbase: pdc.fedorainfracloud.org
hostname: pdc.fedorainfracloud.org
public_ip: 209.132.184.106 public_ip: 209.132.184.106
root_auth_users: pingou root_auth_users: pingou
description: pdc development instance description: pdc development instance

4
roles/pdc/templates/pdc.conf
View file

@ -2,8 +2,8 @@ WSGISocketPrefix /var/run/wsgi
WSGIPythonOptimize 1 WSGIPythonOptimize 1
WSGIDaemonProcess pdc user=apache group=apache maximum-requests=1000 display-name=pdc processes=2 threads=1 shutdown-timeout=10 WSGIDaemonProcess pdc user=apache group=apache maximum-requests=1000 display-name=pdc processes=2 threads=1 shutdown-timeout=10
<VirtualHost {{ hostbase }}:80> <VirtualHost {{ hostname }}:80>
ServerName {{ hostbase }} ServerName {{ hostname }}
CustomLog /var/log/httpd/pdc-access.log combined CustomLog /var/log/httpd/pdc-access.log combined
ErrorLog /var/log/httpd/pdc-error.log ErrorLog /var/log/httpd/pdc-error.log

2
roles/pdc/templates/settings_local.py
View file

@ -84,7 +84,7 @@ REST_API_VERSION = 'v1'
BROWSABLE_DOCUMENT_MACROS = { BROWSABLE_DOCUMENT_MACROS = {
# need to be rewrite with the real host name when deploy. # 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. # make consistent with rest api root.
'API_PATH': '%s%s' % (REST_API_URL, REST_API_VERSION), 'API_PATH': '%s%s' % (REST_API_URL, REST_API_VERSION),
} }