From 0894639b337688779003ba87cde79213ac9bd1e4 Mon Sep 17 00:00:00 2001 From: Jan Broer Date: Thu, 14 May 2015 07:51:49 +0200 Subject: [PATCH] Cloud-init: url and cmdline datasources require network --- cmd/cloudinit/cloudinit.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/cloudinit/cloudinit.go b/cmd/cloudinit/cloudinit.go index 101440ea..7ee24aa6 100644 --- a/cmd/cloudinit/cloudinit.go +++ b/cmd/cloudinit/cloudinit.go @@ -393,12 +393,16 @@ func getDatasources(cfg *rancherConfig.Config) []datasource.Datasource { dss = append(dss, file.NewDatasource(parts[1])) } case "url": - if len(parts) == 2 { - dss = append(dss, url.NewDatasource(parts[1])) + if network { + if len(parts) == 2 { + dss = append(dss, url.NewDatasource(parts[1])) + } } case "cmdline": - if len(parts) == 1 { - dss = append(dss, proc_cmdline.NewDatasource()) + if network { + if len(parts) == 1 { + dss = append(dss, proc_cmdline.NewDatasource()) + } } case "configdrive": if len(parts) == 2 {