opendev/system-config
Code Issues Proposed changes

Merge "Disable puppet-askbot resources temporarily"

Browse Source
This commit is contained in:
Jenkins 2015-06-02 16:06:27 +00:00 committed by Gerrit Code Review
commit 11ceadf29c
1 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
modules/openstack_project/manifests/ask.pp
View File

@ -82,59 +82,63 @@ class openstack_project::ask (
redis_password => $redis_password, redis_password => $redis_password,
} }
# apache http server # Notice:
include apache # Disable all puppet-askbot related resources until refactored
# askbot modules not approved.
# askbot #
class { 'askbot': # # apache http server
redis_enabled => $redis_enabled, # include apache
db_provider => 'pgsql', #
require => Postgresql::Server::Db[$db_name], # # askbot
} # class { 'askbot':
# redis_enabled => $redis_enabled,
# custom askbot theme from openstack-infra/askbot-theme repo # db_provider => 'pgsql',
# require => Postgresql::Server::Db[$db_name],
vcsrepo { "/srv/askbot-sites/${slot_name}/themes": # }
ensure => latest, #
provider => git, # # custom askbot theme from openstack-infra/askbot-theme repo
revision => 'master', #
source => 'https://git.openstack.org/openstack-infra/askbot-theme', # vcsrepo { "/srv/askbot-sites/${slot_name}/themes":
require => [ # ensure => latest,
Class['askbot'], File["/srv/askbot-sites/${slot_name}"], # provider => git,
Package['git'] # revision => 'master',
], # source => 'https://git.openstack.org/openstack-infra/askbot-theme',
notify => [ # require => [
Exec["theme-bundle-install-${slot_name}"], # Class['askbot'], File["/srv/askbot-sites/${slot_name}"],
Exec["theme-bundle-compile-${slot_name}"], # Package['git']
], # ],
} # notify => [
# Exec["theme-bundle-install-${slot_name}"],
askbot::compass { $slot_name: # Exec["theme-bundle-compile-${slot_name}"],
} # ],
# }
askbot::site { $site_name: #
slot_name => $slot_name, # askbot::compass { $slot_name:
askbot_debug => false, # }
custom_theme_enabled => true, #
custom_theme_name => 'os', # askbot::site { $site_name:
redis_enabled => $redis_enabled, # slot_name => $slot_name,
redis_port => $redis_port, # askbot_debug => false,
redis_max_memory => $redis_max_memory, # custom_theme_enabled => true,
redis_bind => $redis_bind, # custom_theme_name => 'os',
redis_password => $redis_password, # redis_enabled => $redis_enabled,
site_ssl_enabled => true, # redis_port => $redis_port,
site_ssl_cert_file_contents => $site_ssl_cert_file_contents, # redis_max_memory => $redis_max_memory,
site_ssl_key_file_contents => $site_ssl_key_file_contents, # redis_bind => $redis_bind,
site_ssl_chain_file_contents => $site_ssl_chain_file_contents, # redis_password => $redis_password,
site_ssl_cert_file => $site_ssl_cert_file, # site_ssl_enabled => true,
site_ssl_key_file => $site_ssl_key_file, # site_ssl_cert_file_contents => $site_ssl_cert_file_contents,
site_ssl_chain_file => $site_ssl_chain_file, # site_ssl_key_file_contents => $site_ssl_key_file_contents,
db_provider => 'pgsql', # site_ssl_chain_file_contents => $site_ssl_chain_file_contents,
db_name => $db_name, # site_ssl_cert_file => $site_ssl_cert_file,
db_user => $db_user, # site_ssl_key_file => $site_ssl_key_file,
db_password => $db_password, # site_ssl_chain_file => $site_ssl_chain_file,
require => [ Class['redis'], Class['askbot'] ], # db_provider => 'pgsql',
} # db_name => $db_name,
# db_user => $db_user,
# db_password => $db_password,
# require => [ Class['redis'], Class['askbot'] ],
# }
pgsql_backup::backup { $db_name: pgsql_backup::backup { $db_name:
database_user => $db_user, database_user => $db_user,