opendev/system-config
Code Issues Proposed changes

Merge "Updated OpenStackId Production Node"

Browse Source
This commit is contained in:
Zuul 2019-02-18 17:53:38 +00:00 committed by Gerrit Code Review
commit 95ed0a77e0
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -1093,7 +1093,7 @@ node /^backup\d+\..*\.ci\.open.*\.org$/ {
include openstack_project::backup_server include openstack_project::backup_server
} }
# Node-OS: trusty # Node-OS: xenial
node /^openstackid\d*(\.openstack)?\.org$/ { node /^openstackid\d*(\.openstack)?\.org$/ {
$group = "openstackid" $group = "openstackid"
class { 'openstack_project::openstackid_prod': class { 'openstack_project::openstackid_prod':
@ -1124,6 +1124,7 @@ node /^openstackid\d*(\.openstack)?\.org$/ {
email_smtp_server => 'smtp.sendgrid.net', email_smtp_server => 'smtp.sendgrid.net',
email_smtp_server_user => hiera('openstackid_smtp_user'), email_smtp_server_user => hiera('openstackid_smtp_user'),
email_smtp_server_password => hiera('openstackid_smtp_password'), email_smtp_server_password => hiera('openstackid_smtp_password'),
php_version => 7,
} }
} }

2
modules/openstack_project/manifests/openstackid_prod.pp
View File

@ -42,7 +42,7 @@ class openstack_project::openstackid_prod (
$serveradmin = '', $serveradmin = '',
$canonicalweburl = '', $canonicalweburl = '',
$session_cookie_domain = '', $session_cookie_domain = '',
$release = '1.0.25', $release = '2.0.0',
$app_url = '', $app_url = '',
$app_key = '', $app_key = '',
$email_driver = 'mail', $email_driver = 'mail',