From 1cfb0442ffaccbbb31ea4f3f3dd7a6842e6d4423 Mon Sep 17 00:00:00 2001
From: Marton Kiss <marton.kiss@gmail.com>
Date: Mon, 11 May 2015 15:55:52 +0200
Subject: [PATCH] Disable puppet-askbot resources temporarily

Disable new puppet-askbot module related resources. This change allows
us to bring-in the refactored puppet-askbot module, consume askbot
from git repository directly and switch to Trusty.

Needed-By: I560c24c3b09e4a8d09b23afa619a4cf361601cbe
Change-Id: Iaa8488a3d7ab8b121404ac1ac39bd1620a868727
---
 modules/openstack_project/manifests/ask.pp | 110 +++++++++++----------
 1 file changed, 57 insertions(+), 53 deletions(-)

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