Skip to content

Commit

Permalink
don't manage etcd from inside flannel
Browse files Browse the repository at this point in the history
  • Loading branch information
cristifalcas committed Mar 23, 2016
1 parent 2bdc4d1 commit fcb1aee
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 20 deletions.
10 changes: 0 additions & 10 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,4 @@
command => '/bin/systemctl daemon-reload',
refreshonly => true,
}

if $flannel::configure_etcd {
etcd_key { "${flannel::etcd_prefix}/config":
value => template("${module_name}/etcd_network_definition.erb"),
peers => $flannel::etcd_endpoints,
cert_file => $flannel::etcd_certfile,
key_file => $flannel::etcd_keyfile,
ca_file => $flannel::etcd_cafile,
}
}
}
5 changes: 0 additions & 5 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@
# if specified, will run in multi-network mode. Value is comma separate list of networks to join.
# Defaults to ""
#
# [*configure_etcd*]
# if we should use the etcd module to insert the etcd_key
# Defaults to false
#
# [*network*]
# IPv4 network in CIDR format to use for the entire flannel network. This is the only mandatory key.
# Defaults to 10.0.0.0/8
Expand Down Expand Up @@ -150,7 +146,6 @@
$remote_cafile = $flannel::params::remote_cafile,
$networks = $flannel::params::networks,
# etcd network definition
$configure_etcd = $flannel::params::configure_etcd,
$network = $flannel::params::network,
$subnetlen = $flannel::params::subnetlen,
$subnetmin = $flannel::params::subnetmin,
Expand Down
1 change: 0 additions & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
$etcd_keyfile = undef
$etcd_certfile = undef
$etcd_cafile = undef
$configure_etcd = false
$network = '10.0.0.0/8'
$subnetlen = undef
$subnetmin = undef
Expand Down
5 changes: 1 addition & 4 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cristifalcas-flannel",
"version": "1.1.0",
"version": "1.2.0",
"author": "Cristian Falcas",
"license": "Apache-2.0",
"project_page": "https://github.com/cristifalcas/puppet-flannel",
Expand Down Expand Up @@ -34,9 +34,6 @@
],
"requirements": [],
"dependencies": [{
"name": "cristifalcas/etcd",
"version_requirement": "1.x"
},{
"name": "cristifalcas/docker",
"version_requirement": "5.x"
}
Expand Down

0 comments on commit fcb1aee

Please sign in to comment.