Merge pull request #4221 from iancoffey/stop_managing_hosts

iancoffey · iancoffey · commit e2c06895ec52 · 2015-08-11T16:27:51.000-04:00
fix(contrib): remove manage_etc_hosts from example user-data
diff --git a/contrib/coreos/user-data.example b/contrib/coreos/user-data.example
@@ -355,4 +355,3 @@ write_files:
           "predicates": [{"name": "PodFitsPorts"},{"name": "PodFitsResources"},{"name": "NoDiskConflict"},{"name": "MatchNodeSelector"},{"name": "HostName"}],
           "priorities": [{"name": "LeastRequestedPriority","weight": 1},{"name": "BalancedResourceAllocation","weight": 1},{"name": "ServiceSpreadingPriority","weight": 2},{"name": "EqualPriority","weight": 1}]
       }
-manage_etc_hosts: localhost

Original file line number	Diff line number	Diff line change
`@@ -355,4 +355,3 @@ write_files:`
`355`	`355`	`"predicates": [{"name": "PodFitsPorts"},{"name": "PodFitsResources"},{"name": "NoDiskConflict"},{"name": "MatchNodeSelector"},{"name": "HostName"}],`
`356`	`356`	`"priorities": [{"name": "LeastRequestedPriority","weight": 1},{"name": "BalancedResourceAllocation","weight": 1},{"name": "ServiceSpreadingPriority","weight": 2},{"name": "EqualPriority","weight": 1}]`
`357`	`357`	`}`
`358`		`-manage_etc_hosts: localhost`