Added swift store credentials to openstackwatch.

Openstackwatch is configured to store feed data in a swift object store.
This patch adds credentials to access that swift store.

Change-Id: I61d9032150ae40fb7d207b5861cf0cf448f6feda
Reviewed-on: https://review.openstack.org/24784
Reviewed-by: Elizabeth Krumbach <lyz@princessleia.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins

manifests/site.pp

@@ -37,6 +37,8 @@ node 'review.openstack.org' {
     contactstore_appsec             => hiera('gerrit_contactstore_appsec'),
     contactstore_pubkey             => hiera('gerrit_contactstore_pubkey'),
     sysadmins                       => hiera('sysadmins'),
+    swift_username                  => hiera('swift_store_user'),
+    swift_password                  => hiera('swift_store_key'),
   }
 }
 

modules/jeepyb/manifests/openstackwatch.pp

@@ -1,6 +1,10 @@
 # == Class: jeepyb::openstackwatch
 
 class jeepyb::openstackwatch(
+  $swift_username = '',
+  $swift_password = '',
+  $swift_auth_url = '',
+  $auth_version = '',
   $projects = [],
   $mode = 'multiple',
   $container = 'rss',
@@ -24,6 +28,7 @@ class jeepyb::openstackwatch(
     require    => Group['openstackwatch'],
   }
 
+  if $swift_password != '' {
     cron { 'openstackwatch':
       ensure  => present,
       command => '/usr/local/bin/openstackwatch /home/openstackwatch/openstackwatch.ini',
@@ -36,6 +41,7 @@ class jeepyb::openstackwatch(
         Class['jeepyb'],
       ],
     }
+  }
 
   file { '/home/openstackwatch/openstackwatch.ini':
     ensure  => present,

modules/jeepyb/templates/openstackwatch.ini.erb

@@ -16,10 +16,10 @@ mode = <%= mode %>
 [swift]
 # username/tenant for swift with 2.0 or just username with 1.0 (i.e:
 # RAX).
-# username =
+username = <%= swift_username %>
 
-# passowrd or api key
-# password =
+# password or api key
+password = <%= swift_password %>
 
 # container to upload (probably want to be public)
 container = <%= container %>
@@ -28,10 +28,10 @@ container = <%= container %>
 # https://auth.api.rackspacecloud.com/v1.0
 # or Rackspace UK :
 # https://lon.auth.api.rackspacecloud.com/v1.0
-# auth_url = https://lon.auth.api.rackspacecloud.com/v1.0
+auth_url = <%= swift_auth_url %>
 
 # auth version (1.0 for Rackspace clouds, 2.0 for keystone backend clusters)
-# auth_version = 1.0
+auth_version = <%= auth_version %>
 
 # the object name where to store the combined rss
 uploaded_file = <%= feed %>

modules/openstack_project/manifests/gerrit.pp

@@ -57,7 +57,9 @@ class openstack_project::gerrit (
   $cla_id = '2',
   $cla_name = 'ICLA',
   $testmode = false,
-  $sysadmins = []
+  $sysadmins = [],
+  $swift_username = '',
+  $swift_password = '',
 ) {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80, 443, 29418],
@@ -73,6 +75,10 @@ class openstack_project::gerrit (
     container      => 'rss',
     feed           => 'openstackwatch.xml',
     json_url       => 'https://review.openstack.org/query?q=status:open',
+    swift_username => $swift_username,
+    swift_password => $swift_password,
+    swift_auth_url => 'https://auth.api.rackspacecloud.com/v1.0',
+    auth_version   => '1.0',
   }
 
   class { '::gerrit':