Skip to content

Commit

Permalink
Use the new puppet GPG key (#164)
Browse files Browse the repository at this point in the history 
* Set correct parameters when upgrading to v4

This change covers 2 scenarios now
- currently running puppet v4
- upgrading to puppet v4

* Use the new puppet GPG key 

This key was generated when Puppet changed from 'puppetlabs' to 'puppet'

* Update the Yum GPG key
  • Loading branch information
@hrpatel @rendhalver
hrpatel authored and rendhalver committed Aug 13, 2017
1 parent 5181075 commit c105b45
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
14 changes: 7 additions & 7 deletions manifests/repo/yum.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
baseurl => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/${::puppet::collection}/${::architecture}",
enabled => '1',
gpgcheck => '1',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
}
} else {

Expand All @@ -31,29 +31,29 @@
baseurl => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/products/${::architecture}",
enabled => '1',
gpgcheck => '1',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
}
yumrepo { 'puppetlabs-products-source':
descr => "Puppet Labs Products EL ${::operatingsystemmajrelease} - ${::architecture} - Source",
baseurl => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/products/SRPMS",
enabled => $source_enable,
gpgcheck => '1',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
}

yumrepo { 'puppetlabs-deps':
descr => "Puppet Labs Dependencies EL ${::operatingsystemmajrelease} - ${::architecture}",
baseurl => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/dependencies/${::architecture}",
enabled => '1',
gpgcheck => '1',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
}
yumrepo { 'puppetlabs-deps-source':
descr => "Puppet Labs Dependencies EL ${::operatingsystemmajrelease} - ${::architecture} - Source",
baseurl => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/dependencies/SRPMS",
enabled => $source_enable,
gpgcheck => '1',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
failovermethod => 'priority'
}

Expand All @@ -62,14 +62,14 @@
baseurl => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/devel/${::architecture}",
enabled => $devel_enabled,
gpgcheck => '1',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
}
yumrepo { 'puppetlabs-devel-source':
descr => "Puppet Labs Devel EL ${::operatingsystemmajrelease} - ${::architecture} - Source",
baseurl => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/devel/SRPMS",
enabled => $source_enable,
gpgcheck => '1',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
gpgkey => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
}
}

Expand Down
36 changes: 18 additions & 18 deletions spec/classes/puppet_repo_yum_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,23 @@
'baseurl'=>'http://yum.puppetlabs.com/el/5/products/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
when '6'
should contain_yumrepo('puppetlabs-products').with({
'descr'=>'Puppet Labs Products EL 6 - x86_64',
'baseurl'=>'http://yum.puppetlabs.com/el/6/products/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
when '7'
should contain_yumrepo('puppetlabs-products').with({
'descr'=>'Puppet Labs Products EL 7 - x86_64',
'baseurl'=>'http://yum.puppetlabs.com/el/7/products/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
end
end
Expand All @@ -71,23 +71,23 @@
'baseurl'=>'http://yum.puppetlabs.com/el/5/dependencies/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
when '6'
should contain_yumrepo('puppetlabs-deps').with({
'descr'=>'Puppet Labs Dependencies EL 6 - x86_64',
'baseurl'=>'http://yum.puppetlabs.com/el/6/dependencies/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
when '7'
should contain_yumrepo('puppetlabs-deps').with({
'descr'=>'Puppet Labs Dependencies EL 7 - x86_64',
'baseurl'=>'http://yum.puppetlabs.com/el/7/dependencies/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
end
end
Expand All @@ -99,23 +99,23 @@
'baseurl'=>'http://yum.puppetlabs.com/el/5/devel/x86_64',
'enabled'=>'0',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
when '6'
should contain_yumrepo('puppetlabs-devel').with({
'descr'=>'Puppet Labs Devel EL 6 - x86_64',
'baseurl'=>'http://yum.puppetlabs.com/el/6/devel/x86_64',
'enabled'=>'0',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
when '7'
should contain_yumrepo('puppetlabs-devel').with({
'descr'=>'Puppet Labs Devel EL 7 - x86_64',
'baseurl'=>'http://yum.puppetlabs.com/el/7/devel/x86_64',
'enabled'=>'0',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
end
end
Expand All @@ -140,7 +140,7 @@
'baseurl'=>'http://yum.puppetlabs.com/el/5/BOGON/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
should_not contain_yumrepo('puppetlabs-products')
should_not contain_yumrepo('puppetlabs-deps')
Expand All @@ -151,7 +151,7 @@
'baseurl'=>'http://yum.puppetlabs.com/el/6/BOGON/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
should_not contain_yumrepo('puppetlabs-products')
should_not contain_yumrepo('puppetlabs-deps')
Expand All @@ -162,7 +162,7 @@
'baseurl'=>'http://yum.puppetlabs.com/el/7/BOGON/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
should_not contain_yumrepo('puppetlabs-products')
should_not contain_yumrepo('puppetlabs-deps')
Expand All @@ -181,23 +181,23 @@
'baseurl'=>'http://yum.puppetlabs.com/el/5/devel/x86_64',
'enabled'=>'0',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
when '6'
should contain_yumrepo('puppetlabs-devel').with({
'descr'=>'Puppet Labs Devel EL 6 - x86_64',
'baseurl'=>'http://yum.puppetlabs.com/el/6/devel/x86_64',
'enabled'=>'0',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
when '7'
should contain_yumrepo('puppetlabs-devel').with({
'descr'=>'Puppet Labs Devel EL 7 - x86_64',
'baseurl'=>'http://yum.puppetlabs.com/el/7/devel/x86_64',
'enabled'=>'0',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
end#end case
end
Expand All @@ -213,23 +213,23 @@
'baseurl'=>'http://yum.puppetlabs.com/el/5/devel/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
when '6'
should contain_yumrepo('puppetlabs-devel').with({
'descr'=>'Puppet Labs Devel EL 6 - x86_64',
'baseurl'=>'http://yum.puppetlabs.com/el/6/devel/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
when '7'
should contain_yumrepo('puppetlabs-devel').with({
'descr'=>'Puppet Labs Devel EL 7 - x86_64',
'baseurl'=>'http://yum.puppetlabs.com/el/7/devel/x86_64',
'enabled'=>'1',
'gpgcheck'=>'1',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
})
end
end
Expand Down

0 comments on commit c105b45

Please sign in to comment.