Allow pinning the lodgeit version

We're about to land some changes to lodgeit and it seems like we
might want to be careful about rolling them out.

Change-Id: I6e136099ba1f321ad008b14042574211b7d5e56d
This commit is contained in:
Monty Taylor 2020-03-04 15:45:10 -06:00 committed by Clark Boylan
parent 4af16d4684
commit fbc4f1ed8b
3 changed files with 10 additions and 7 deletions

View File

@ -1,6 +1,8 @@
# == Class: lodgeit # == Class: lodgeit
# #
class lodgeit { class lodgeit(
$lodgeit_version = 'master'
) {
$packages = [ 'python-imaging', $packages = [ 'python-imaging',
'python-jinja2', 'python-jinja2',
'python-pybabel', 'python-pybabel',
@ -8,9 +10,9 @@ class lodgeit {
'python-simplejson', 'python-simplejson',
'python-pygments'] 'python-pygments']
include ::httpd include httpd
include ::pip include pip
httpd_mod { 'proxy': httpd_mod { 'proxy':
ensure => present, ensure => present,
} }
@ -40,8 +42,9 @@ class lodgeit {
vcsrepo { '/tmp/lodgeit-main': vcsrepo { '/tmp/lodgeit-main':
ensure => latest, ensure => latest,
revision => $lodgeit_version,
provider => git, provider => git,
source => 'https://git.openstack.org/openstack-infra/lodgeit', source => 'https://opendev.org/opendev/lodgeit',
} }
} }

View File

@ -6,7 +6,7 @@ class lodgeit::mysql(
$database_name = $name, $database_name = $name,
$database_user = $name, $database_user = $name,
) { ) {
class { '::mysql::server': class { 'mysql::server':
root_password => $mysql_root_password, root_password => $mysql_root_password,
override_options => { override_options => {
'mysqld' => { 'mysqld' => {
@ -14,7 +14,7 @@ class lodgeit::mysql(
} }
} }
} }
include ::mysql::server::account_security include mysql::server::account_security
mysql::db { $database_name: mysql::db { $database_name:
user => $database_user, user => $database_user,

View File

@ -12,7 +12,7 @@ define lodgeit::site(
$vhost_name = "paste.${name}.org", $vhost_name = "paste.${name}.org",
) { ) {
include ::httpd include httpd
::httpd::vhost::proxy { $vhost_name: ::httpd::vhost::proxy { $vhost_name:
port => 80, port => 80,