diff --git a/manifests/site.pp b/manifests/site.pp
index 3bf096ccb0..9fc6bd5808 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -407,6 +407,7 @@ node /^wiki-dev\d+\.openstack\.org$/ {
     wg_upgradekey         => hiera('wg_upgradekey'),
     wg_recaptchasitekey   => hiera('wg_recaptchasitekey'),
     wg_recaptchasecretkey => hiera('wg_recaptchasecretkey'),
+    disallow_robots       => true,
   }
 }
 
diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp
index d53362222a..d71aaa8b82 100644
--- a/modules/openstack_project/manifests/wiki.pp
+++ b/modules/openstack_project/manifests/wiki.pp
@@ -17,6 +17,7 @@ class openstack_project::wiki (
   $wg_recaptchasitekey = undef,
   $wg_recaptchasecretkey = undef,
   $wg_googleanalyticsaccount = undef,
+  $disallow_robots = undef,
 ) {
 
   package { ['openssl', 'ssl-cert', 'subversion']:
@@ -54,6 +55,7 @@ class openstack_project::wiki (
     wg_googleanalyticsaccount  => $wg_googleanalyticsaccount,
     wg_sitename                => 'OpenStack',
     wg_logo                    => "https://${site_hostname}/w/images/thumb/c/c4/OpenStack_Logo_-_notext.png/30px-OpenStack_Logo_-_notext.png",
+    disallow_robots            => $disallow_robots,
   }
   class { 'memcached':
     max_memory => 2048,