Skip to content

Commit

Permalink
Don't use init class to install the client. Use a specialized class f…
Browse files Browse the repository at this point in the history
…or this.
  • Loading branch information
cristifalcas committed Apr 14, 2016
1 parent cf78ab8 commit d1013b7
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 21 deletions.
19 changes: 3 additions & 16 deletions manifests/init.pp
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
# Class: kubernetes
#
# This module manages kubernetes
# This module manages nothing.
#
# Parameters:
# Parameters: None
#
# [*ensure*]
# Set package version to be installed or use 'installed'/'latest'
# Defaults to installed
#
class kubernetes ($ensure = 'installed',) {
# /etc/kubernetes/config is managed by both master and node rpms
# so we take care of it here
package { 'kubernetes-client': ensure => $ensure, } ->
file { '/etc/kubernetes/': ensure => 'directory', } ->
file { '/etc/kubernetes/config':
ensure => 'file',
force => true,
content => template("${module_name}/etc/kubernetes/config.erb"),
}
class kubernetes {
}
2 changes: 1 addition & 1 deletion manifests/master.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Defaults to present
#
class kubernetes::master ($ensure = 'present',) {
include ::kubernetes
include ::kubernetes::client

# this should ensure also that all files from /etc/kubernetes are managed after package install
package { 'kubernetes-master': ensure => $ensure, } -> File['/etc/kubernetes/']
Expand Down
2 changes: 1 addition & 1 deletion manifests/node.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Defaults to present
#
class kubernetes::node ($ensure = 'present',) {
include ::kubernetes
include ::kubernetes::client

# this should ensure also that all files from /etc/kubernetes are managed after package install
package { ['kubernetes-node']: ensure => $ensure, } -> File['/etc/kubernetes/'] ->
Expand Down
2 changes: 1 addition & 1 deletion manifests/node/kubelet.pp
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
#
# [*args*]
# Add your own!

#
class kubernetes::node::kubelet (
$ensure = $kubernetes::node::params::kubelet_service_ensure,
$enable = $kubernetes::node::params::kubelet_service_enable,
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cristifalcas-kubernetes",
"version": "1.0.0",
"version": "1.1.0",
"author": "Cristian Falcas",
"license": "Apache-2.0",
"summary": "Configuring and installing kubernetes",
Expand Down Expand Up @@ -43,7 +43,7 @@
"version_requirement": "4.x"
},{
"name": "puppetlabs/concat",
"version_requirement": "1.x"
"version_requirement": "2.x"
},{
"name": "cristifalcas/docker",
"version_requirement": "5.x"
Expand Down

0 comments on commit d1013b7

Please sign in to comment.