opendev/puppet-storyboard
Code Issues Proposed changes

Updated storyboard configuration for pymysql.

Browse Source 
In order to support Python3, https://review.openstack.org/#/c/152339/ is switching
to a mysql driver that's supported by Python3. This updates the puppet module to use
the new connection string.

Change-Id: Id5d9eacd8de5700675848d3129b189fad07a221b
This commit is contained in:
Michael Krotscheck 2015-02-17 12:38:12 -08:00
parent 12bb2c8d42
commit 936abca6a6
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/application.pp
View File

@ -72,7 +72,6 @@ class storyboard::application (
dev => true, dev => true,
} }
include python::install include python::install
include mysql::python
if !defined(Package['git']) { if !defined(Package['git']) {
package { 'git': package { 'git':
@ -174,7 +173,6 @@ class storyboard::application (
File['/etc/storyboard/storyboard.conf'], File['/etc/storyboard/storyboard.conf'],
], ],
require => [ require => [
Class['mysql::python'],
File['/etc/storyboard/storyboard.conf'], File['/etc/storyboard/storyboard.conf'],
], ],
notify => Service['httpd'], notify => Service['httpd'],

2
templates/storyboard.conf.erb
View File

@ -81,7 +81,7 @@ max_age=<%= @cors_max_age %>
# connection = mysql://root:pass@127.0.0.1:3306/storyboard # connection = mysql://root:pass@127.0.0.1:3306/storyboard
# Replace 127.0.0.1 above with the IP address of the database used by the # Replace 127.0.0.1 above with the IP address of the database used by the
# main storyboard server. (Leave it as is if the database runs on this host.) # main storyboard server. (Leave it as is if the database runs on this host.)
connection=mysql://<%= @mysql_user %>:<%= @mysql_user_password %>@<%= @mysql_host %>:<%= @mysql_port %>/<%= @mysql_database %> connection=mysql+pymysql://<%= @mysql_user %>:<%= @mysql_user_password %>@<%=@mysql_host %>:<%= @mysql_port %>/<%= @mysql_database %>
# The SQLAlchemy connection string used to connect to the slave database # The SQLAlchemy connection string used to connect to the slave database
# slave_connection = # slave_connection =