Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402411 )
Change subject: Use python3 async gthread workers for superset
......................................................................
Use python3 async gthread workers for superset
Bug: T182688
Change-Id: Id2dcef636e107807cc3e3e171689bbaec2fad0e2
---
M modules/profile/manifests/superset.pp
M modules/superset/manifests/init.pp
2 files changed, 11 insertions(+), 9 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/profile/manifests/superset.pp
b/modules/profile/manifests/superset.pp
index 4878c7a..5319b60 100644
--- a/modules/profile/manifests/superset.pp
+++ b/modules/profile/manifests/superset.pp
@@ -36,14 +36,14 @@
# statsd host:port
#
class profile::superset(
- $workers = hiera('profile::superset::workers', 1),
- $database_uri = hiera('profile::superset::database_uri',
'sqlite:////var/lib/superset/superset.db'),
- $database_password = hiera('profile::superset::database_password', undef),
- $admin_user = hiera('profile::superset::admin_user', 'admin'),
- $admin_password = hiera('profile::superset::admin_password', 'admin'),
- $secret_key = hiera('profile::superset::secret_key',
'not_really_a_secret_key'),
+ $workers = hiera('profile::superset::workers', 1),
+ $database_uri = hiera('profile::superset::database_uri',
'sqlite:////var/lib/superset/superset.db'),
+ $database_password = hiera('profile::superset::database_password', undef),
+ $admin_user = hiera('profile::superset::admin_user', 'admin'),
+ $admin_password = hiera('profile::superset::admin_password', 'admin'),
+ $secret_key = hiera('profile::superset::secret_key',
'not_really_a_secret_key'),
$ldap_proxy_enabled = hiera('profile::superset::ldap_proxy_enabled',
false),
- $statsd = hiera('statsd', undef),
+ $statsd = hiera('statsd', undef),
) {
# If given $database_password, insert it into $database_uri.
$full_database_uri = $database_password ? {
@@ -88,6 +88,8 @@
class { '::superset':
workers => $workers,
+ # gthread requires python3.
+ worker_class => 'gthread',
database_uri => $full_database_uri,
secret_key => $secret_key,
admin_user => $admin_user,
diff --git a/modules/superset/manifests/init.pp
b/modules/superset/manifests/init.pp
index 8278b12..d4cc64f 100644
--- a/modules/superset/manifests/init.pp
+++ b/modules/superset/manifests/init.pp
@@ -27,7 +27,7 @@
# Number of gevent workers
#
# [*worker_class*]
-# Gunicorn worker-class. sync or gevent. Default: sync
+# Gunicorn worker-class. Default: sync
#
# [*admin_user*]
# Web UI admin user
@@ -72,7 +72,7 @@
) {
requires_os('debian >= jessie')
require_package(
- 'python',
+ 'python3',
'virtualenv',
'firejail',
)
--
To view, visit https://gerrit.wikimedia.org/r/402411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2dcef636e107807cc3e3e171689bbaec2fad0e2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
