-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Templates for OpenStack Antelope version
Main changes compared to Yoga templates: - All API services, except Keystone, handled by uwsgi instead of the openstack-xxx-api service (recommended configuration) - https terminated by a Nginx proxy for all API services, including the WSGI apps run into Apache (Keystone, Horizon)
- Loading branch information
Showing
102 changed files
with
2,267 additions
and
603 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| # Add a Nginx VH for handling barbican https requests | ||
|
|
||
| unique template features/barbican/nginx/config; | ||
|
|
||
| variable OS_BARBICAN_PUBLIC_HOST ?= error('OS_BARBICAN_PUBLIC_HOST must be defined when using SSL with Barbican'); | ||
| variable OS_BARBICAN_PUBLIC_PORT ?= error('OS_BARBICAN_PUBLIC_PORT must be defined when using SSL with Barbican'); | ||
|
|
||
| include 'types/openstack/core'; | ||
|
|
||
| # Add Nginx and its base configuration | ||
| include 'features/nginx/openstack/config'; | ||
|
|
||
| # Nginx proxy configuration for Barbican | ||
| prefix '/software/components/metaconfig/services/{/etc/nginx/conf.d/barbican.conf}'; | ||
| 'module' = 'openstack/nginx-proxy'; | ||
| 'daemons/nginx' = 'restart'; | ||
| bind '/software/components/metaconfig/services/{/etc/nginx/conf.d/barbican.conf}/contents' = openstack_nginx_proxy_config; | ||
|
|
||
| 'contents/bind_port' = OS_BARBICAN_PUBLIC_PORT; | ||
| 'contents/proxy_host' = OS_BARBICAN_CONTROLLER_HOST; | ||
| 'contents/proxy_port' = OS_BARBICAN_CONTROLLER_PORT; | ||
| 'contents/server_name' = OS_BARBICAN_PUBLIC_HOST; | ||
| 'contents/service' = 'barbican'; | ||
| 'contents/ssl' = openstack_load_ssl_config( true ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| unique template features/barbican/uwsgi/config; | ||
|
|
||
|
|
||
| include 'features/uwsgi/openstack/config'; | ||
|
|
||
| # Load TT file to configure uwsgi application | ||
| # Run metaconfig in case the TT file was modified and configuration must be regenerated | ||
| include 'components/filecopy/config'; | ||
| '/software/components/filecopy/dependencies/post' = openstack_add_component_dependency('metaconfig'); | ||
| prefix '/software/components/filecopy/services/{/usr/share/templates/quattor/metaconfig/openstack/barbican-api.tt}'; | ||
| 'config' = file_contents('features/uwsgi/openstack/vassal-paste_deploy.ini.tt'); | ||
| 'perms' = '0644'; | ||
|
|
||
| # uwsgi configuration for Barbican API: no explicit restart needed, handled by uwsgi when config file changes | ||
| prefix '/software/components/metaconfig/services/{/etc/uwsgi.d/barbican-api.ini}'; | ||
| 'module' = 'openstack/barbican-api'; | ||
| # Owner/group must match the one used to run the application | ||
| 'group' = OS_BARBICAN_GROUP; | ||
| 'owner' = OS_BARBICAN_USERNAME; | ||
| bind '/software/components/metaconfig/services/{/etc/uwsgi.d/barbican-api.ini}/contents' = openstack_uwsgi_application_config; | ||
|
|
||
| 'contents/bind_host' = OS_BARBICAN_CONTROLLER_HOST; | ||
| 'contents/bind_port' = OS_BARBICAN_CONTROLLER_PORT; | ||
| 'contents/config_files' = list('/etc/barbican/barbican.conf'); | ||
| 'contents/group' = OS_BARBICAN_GROUP; | ||
| 'contents/log_file' = format("%s/api.log", OS_BARBICAN_LOG_DIR); | ||
| 'contents/processes' = OS_BARBICAN_API_PROCESSES; | ||
| 'contents/user' = OS_BARBICAN_USERNAME; | ||
| 'contents/wsgi_file' = '/etc/barbican/barbican-api-paste.ini'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| unique template features/cinder/uwsgi/config; | ||
|
|
||
|
|
||
| include 'features/uwsgi/openstack/config'; | ||
|
|
||
| # Load TT file to configure uwsgi application | ||
| # Run metaconfig in case the TT file was modified and configuration must be regenerated | ||
| include 'components/filecopy/config'; | ||
| '/software/components/filecopy/dependencies/post' = openstack_add_component_dependency('metaconfig'); | ||
| prefix '/software/components/filecopy/services/{/usr/share/templates/quattor/metaconfig/openstack/cinder-api.tt}'; | ||
| 'config' = file_contents('features/uwsgi/openstack/vassal-generic.ini.tt'); | ||
| 'perms' = '0644'; | ||
|
|
||
| # uwsgi configuration for Cinder API: no explicit restart needed, handled by uwsgi when config file changes | ||
| prefix '/software/components/metaconfig/services/{/etc/uwsgi.d/cinder-api.ini}'; | ||
| 'module' = 'openstack/cinder-api'; | ||
| # Owner/group must match the one used to run the application | ||
| 'group' = OS_CINDER_GROUP; | ||
| 'owner' = OS_CINDER_USERNAME; | ||
| bind '/software/components/metaconfig/services/{/etc/uwsgi.d/cinder-api.ini}/contents' = openstack_uwsgi_application_config; | ||
|
|
||
| 'contents/bind_host' = OS_CINDER_CONTROLLER_HOST; | ||
| 'contents/bind_port' = OS_CINDER_CONTROLLER_PORT; | ||
| 'contents/config_files' = list('/etc/cinder/cinder.conf'); | ||
| 'contents/group' = OS_CINDER_GROUP; | ||
| 'contents/log_file' = format("%s/uwsgi-api.log", OS_CINDER_LOG_DIR); | ||
| 'contents/processes' = OS_CINDER_API_PROCESSES; | ||
| 'contents/threads' = 1; | ||
| 'contents/user' = OS_CINDER_USERNAME; | ||
| 'contents/wsgi_file' = '/usr/bin/cinder-wsgi'; |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.