From c68488ea42c383aab472b702e1bb88ab2d5a5dfa Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 16 Jul 2011 17:43:35 -0400 Subject: [PATCH] We do not want launchpad_login. --- manifests/static_users.pp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/manifests/static_users.pp b/manifests/static_users.pp index 6dec4b05ea..b7cb2287d6 100644 --- a/manifests/static_users.pp +++ b/manifests/static_users.pp @@ -58,20 +58,6 @@ class static_users { require => File['jenkinssshdir'], } - file { 'jenkinsknownhosts': - name => $operatingsystem ? { - Darwin => '/Users/jenkins/.ssh/known_hosts', - solaris => '/export/home/jenkins/.ssh/known_hosts', - default => '/home/jenkins/.ssh/known_hosts', - }, - owner => 'jenkins', - group => 'jenkins', - mode => 640, - content => "|1|XzfKCGSQyHk+M88ZBZnWCScejBQ=|+bzuLzUoy4250VElmrm6xjC8ZBY= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEApuXd4MHTfr1qLXWeClxTTQYZQblCA+nHvbjAjowkEd2Y4kpvntJOVewoSwa22zTbiYSmmssCuCkFHwcpnZBZN5qMWewjizav30WfeyLR5Kng5qucxmFAEkNJjCJiu194wRNKu0cD99Uk/6X/AfsWGLgmL5pa5UFk62aW+iZLUQ8=\n|1|2FERa3tAmcEXYRj4vrbpIWnJYHE=|241nOvi5SYvVsrogymSM84tEC/0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEApuXd4MHTfr1qLXWeClxTTQYZQblCA+nHvbjAjowkEd2Y4kpvntJOVewoSwa22zTbiYSmmssCuCkFHwcpnZBZN5qMWewjizav30WfeyLR5Kng5qucxmFAEkNJjCJiu194wRNKu0cD99Uk/6X/AfsWGLgmL5pa5UFk62aW+iZLUQ8=\n", - ensure => 'present', - require => File['jenkinssshdir'], - } - file { 'jenkinsbashrc': name => $operatingsystem ? { Darwin => '/Users/jenkins/.bashrc', @@ -137,7 +123,7 @@ class static_users { owner => 'jenkins', group => 'jenkins', mode => 640, - content => "[DEFAULT]\nemail = OpenStack Jenkins \nlaunchpad_username = hudson-openstack\n", + content => "[DEFAULT]\nemail = OpenStack Jenkins \n", ensure => 'present', require => File['jenkinsbazaardir'], }