move coreos-cloudinit into config/cloudinit

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

cmd/cloudinitexecute/cloudinitexecute.go

@@ -9,7 +9,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/coreos/coreos-cloudinit/system"
+	"github.com/rancher/os/config/cloudinit/system"
 	rancherConfig "github.com/rancher/os/config"
 	"github.com/rancher/os/docker"
 	"github.com/rancher/os/log"

cmd/cloudinitsave/cloudinitsave.go

@@ -25,16 +25,16 @@ import (
 
 	yaml "github.com/cloudfoundry-incubator/candiedyaml"
 
-	"github.com/coreos/coreos-cloudinit/config"
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/configdrive"
-	"github.com/coreos/coreos-cloudinit/datasource/file"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/digitalocean"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/ec2"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/packet"
-	"github.com/coreos/coreos-cloudinit/datasource/proc_cmdline"
-	"github.com/coreos/coreos-cloudinit/datasource/url"
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/configdrive"
+	"github.com/rancher/os/config/cloudinit/datasource/file"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/digitalocean"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/ec2"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/packet"
+	"github.com/rancher/os/config/cloudinit/datasource/proc_cmdline"
+	"github.com/rancher/os/config/cloudinit/datasource/url"
+	"github.com/rancher/os/config/cloudinit/pkg"
 	"github.com/docker/docker/pkg/mount"
 	"github.com/rancher/os/cmd/cloudinitsave/gce"
 	"github.com/rancher/os/cmd/control"

cmd/cloudinitsave/gce/metadata.go

@@ -21,8 +21,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata"
 )
 
 const (

config/cloudinit/Documentation/cloud-config.md

@@ -41,7 +41,7 @@ If cloud-config header starts on `#!` then coreos-cloudinit will recognize it as
 
 ### Providing Cloud-Config with Config-Drive
 
-CoreOS tries to conform to each platform's native method to provide user data. Each cloud provider tends to be unique, but this complexity has been abstracted by CoreOS. You can view each platform's instructions on their documentation pages. The most universal way to provide cloud-config is [via config-drive](https://github.com/coreos/coreos-cloudinit/blob/master/Documentation/config-drive.md), which attaches a read-only device to the machine, that contains your cloud-config file.
+CoreOS tries to conform to each platform's native method to provide user data. Each cloud provider tends to be unique, but this complexity has been abstracted by CoreOS. You can view each platform's instructions on their documentation pages. The most universal way to provide cloud-config is [via config-drive](https://github.com/rancher/os/config/cloudinit/blob/master/Documentation/config-drive.md), which attaches a read-only device to the machine, that contains your cloud-config file.
 
 ## Configuration Parameters
 

config/cloudinit/README.md

@@ -13,8 +13,8 @@ Additionally, several [CoreOS-specific options][custom-cloud-config] have been i
 All supported cloud-config parameters are [documented here][all-cloud-config]. 
 
 [official-cloud-config]: http://cloudinit.readthedocs.org/en/latest/topics/format.html#cloud-config-data
-[custom-cloud-config]: https://github.com/coreos/coreos-cloudinit/blob/master/Documentation/cloud-config.md#coreos-parameters
-[all-cloud-config]: https://github.com/coreos/coreos-cloudinit/tree/master/Documentation/cloud-config.md
+[custom-cloud-config]: https://github.com/rancher/os/config/cloudinit/blob/master/Documentation/cloud-config.md#coreos-parameters
+[all-cloud-config]: https://github.com/rancher/os/config/cloudinit/tree/master/Documentation/cloud-config.md
 
 The following is an example cloud-config document:
 

config/cloudinit/config/validate/rules.go

@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/coreos/coreos-cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/config"
 )
 
 type rule func(config node, report *Report)

config/cloudinit/config/validate/validate.go

@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/coreos/coreos-cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/config"
 
 	"github.com/coreos/yaml"
 )

config/cloudinit/coreos-cloudinit.go

@@ -26,24 +26,24 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/coreos-cloudinit/config"
-	"github.com/coreos/coreos-cloudinit/config/validate"
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/configdrive"
-	"github.com/coreos/coreos-cloudinit/datasource/file"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/cloudsigma"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/digitalocean"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/ec2"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/gce"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/packet"
-	"github.com/coreos/coreos-cloudinit/datasource/proc_cmdline"
-	"github.com/coreos/coreos-cloudinit/datasource/url"
-	"github.com/coreos/coreos-cloudinit/datasource/vmware"
-	"github.com/coreos/coreos-cloudinit/datasource/waagent"
-	"github.com/coreos/coreos-cloudinit/initialize"
-	"github.com/coreos/coreos-cloudinit/network"
-	"github.com/coreos/coreos-cloudinit/pkg"
-	"github.com/coreos/coreos-cloudinit/system"
+	"github.com/rancher/os/config/cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/config/validate"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/configdrive"
+	"github.com/rancher/os/config/cloudinit/datasource/file"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/cloudsigma"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/digitalocean"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/ec2"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/gce"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/packet"
+	"github.com/rancher/os/config/cloudinit/datasource/proc_cmdline"
+	"github.com/rancher/os/config/cloudinit/datasource/url"
+	"github.com/rancher/os/config/cloudinit/datasource/vmware"
+	"github.com/rancher/os/config/cloudinit/datasource/waagent"
+	"github.com/rancher/os/config/cloudinit/initialize"
+	"github.com/rancher/os/config/cloudinit/network"
+	"github.com/rancher/os/config/cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/system"
 )
 
 const (

config/cloudinit/coreos-cloudinit_test.go

@@ -21,8 +21,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/config"
-	"github.com/coreos/coreos-cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/datasource"
 )
 
 func TestMergeConfigs(t *testing.T) {

config/cloudinit/datasource/configdrive/configdrive.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource"
 )
 
 const (

config/cloudinit/datasource/configdrive/configdrive_test.go

@@ -18,8 +18,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/test"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/test"
 )
 
 func TestFetchMetadata(t *testing.T) {

config/cloudinit/datasource/file/file.go

@@ -18,7 +18,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource"
 )
 
 type localFile struct {

config/cloudinit/datasource/metadata/cloudsigma/server_context.go

@@ -24,7 +24,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource"
 
 	"github.com/cloudsigma/cepgo"
 )

config/cloudinit/datasource/metadata/digitalocean/metadata.go

@@ -19,8 +19,8 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata"
 )
 
 const (

config/cloudinit/datasource/metadata/digitalocean/metadata_test.go

@@ -20,10 +20,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/test"
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/test"
+	"github.com/rancher/os/config/cloudinit/pkg"
 )
 
 func TestType(t *testing.T) {

config/cloudinit/datasource/metadata/ec2/metadata.go

@@ -22,9 +22,9 @@ import (
 	"net"
 	"strings"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata"
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata"
+	"github.com/rancher/os/config/cloudinit/pkg"
 )
 
 const (

config/cloudinit/datasource/metadata/ec2/metadata_test.go

@@ -20,10 +20,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/test"
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/test"
+	"github.com/rancher/os/config/cloudinit/pkg"
 )
 
 func TestType(t *testing.T) {

config/cloudinit/datasource/metadata/gce/metadata.go

@@ -19,8 +19,8 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata"
 )
 
 const (

config/cloudinit/datasource/metadata/gce/metadata_test.go

@@ -20,10 +20,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/test"
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/test"
+	"github.com/rancher/os/config/cloudinit/pkg"
 )
 
 func TestType(t *testing.T) {

config/cloudinit/datasource/metadata/metadata.go

@@ -18,7 +18,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/pkg"
 )
 
 type MetadataService struct {

config/cloudinit/datasource/metadata/metadata_test.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/test"
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/test"
+	"github.com/rancher/os/config/cloudinit/pkg"
 )
 
 func TestAvailabilityChanges(t *testing.T) {

config/cloudinit/datasource/metadata/packet/metadata.go

@@ -19,8 +19,8 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/metadata"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata"
 )
 
 const (

config/cloudinit/datasource/metadata/test/test.go

@@ -17,7 +17,7 @@ package test
 import (
 	"fmt"
 
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/pkg"
 )
 
 type HttpClient struct {

config/cloudinit/datasource/proc_cmdline/proc_cmdline.go

@@ -20,8 +20,8 @@ import (
 	"log"
 	"strings"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/pkg"
 )
 
 const (

config/cloudinit/datasource/url/url.go

@@ -15,8 +15,8 @@
 package url
 
 import (
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/pkg"
 )
 
 type remoteFile struct {

config/cloudinit/datasource/vmware/vmware.go

@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/coreos/coreos-cloudinit/config"
-	"github.com/coreos/coreos-cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/datasource"
 )
 
 type readConfigFunction func(key string) (string, error)

config/cloudinit/datasource/vmware/vmware_amd64.go

@@ -19,7 +19,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/coreos/coreos-cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/pkg"
 
 	"github.com/sigma/vmw-guestinfo/rpcvmx"
 	"github.com/sigma/vmw-guestinfo/vmcheck"

config/cloudinit/datasource/vmware/vmware_test.go

@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource"
 )
 
 type MockHypervisor map[string]string

config/cloudinit/datasource/waagent/waagent.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource"
 )
 
 type waagent struct {

config/cloudinit/datasource/waagent/waagent_test.go

@@ -19,8 +19,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/datasource/test"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/datasource/test"
 )
 
 func TestFetchMetadata(t *testing.T) {

config/cloudinit/initialize/config.go

@@ -20,9 +20,9 @@ import (
 	"log"
 	"path"
 
-	"github.com/coreos/coreos-cloudinit/config"
-	"github.com/coreos/coreos-cloudinit/network"
-	"github.com/coreos/coreos-cloudinit/system"
+	"github.com/rancher/os/config/cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/network"
+	"github.com/rancher/os/config/cloudinit/system"
 )
 
 // CloudConfigFile represents a CoreOS specific configuration option that can generate

config/cloudinit/initialize/config_test.go

@@ -18,9 +18,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/config"
-	"github.com/coreos/coreos-cloudinit/network"
-	"github.com/coreos/coreos-cloudinit/system"
+	"github.com/rancher/os/config/cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/network"
+	"github.com/rancher/os/config/cloudinit/system"
 )
 
 type TestUnitManager struct {

config/cloudinit/initialize/env.go

@@ -21,9 +21,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/coreos/coreos-cloudinit/config"
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/system"
+	"github.com/rancher/os/config/cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/system"
 )
 
 const DefaultSSHKeyName = "coreos-cloudinit"

config/cloudinit/initialize/env_test.go

@@ -21,8 +21,8 @@ import (
 	"path"
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/datasource"
-	"github.com/coreos/coreos-cloudinit/system"
+	"github.com/rancher/os/config/cloudinit/datasource"
+	"github.com/rancher/os/config/cloudinit/system"
 )
 
 func TestEnvironmentApply(t *testing.T) {

config/cloudinit/initialize/github.go

@@ -17,7 +17,7 @@ package initialize
 import (
 	"fmt"
 
-	"github.com/coreos/coreos-cloudinit/system"
+	"github.com/rancher/os/config/cloudinit/system"
 )
 
 func SSHImportGithubUser(system_user string, github_user string) error {

config/cloudinit/initialize/ssh_keys.go

@@ -18,8 +18,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/coreos/coreos-cloudinit/pkg"
-	"github.com/coreos/coreos-cloudinit/system"
+	"github.com/rancher/os/config/cloudinit/pkg"
+	"github.com/rancher/os/config/cloudinit/system"
 )
 
 type UserKey struct {

config/cloudinit/initialize/user_data.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"log"
 
-	"github.com/coreos/coreos-cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/config"
 )
 
 var (

config/cloudinit/initialize/user_data_test.go

@@ -17,7 +17,7 @@ package initialize
 import (
 	"testing"
 
-	"github.com/coreos/coreos-cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/config"
 )
 
 func TestParseHeaderCRLF(t *testing.T) {

config/cloudinit/initialize/workspace.go

@@ -19,8 +19,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/coreos/coreos-cloudinit/config"
-	"github.com/coreos/coreos-cloudinit/system"
+	"github.com/rancher/os/config/cloudinit/config"
+	"github.com/rancher/os/config/cloudinit/system"
 )
 
 func PrepWorkspace(workspace string) error {

config/cloudinit/network/packet.go

@@ -17,7 +17,7 @@ package network
 import (
 	"net"
 
-	"github.com/coreos/coreos-cloudinit/datasource/metadata/packet"
+	"github.com/rancher/os/config/cloudinit/datasource/metadata/packet"
 )
 
 func ProcessPacketNetconf(netdata packet.NetworkData) ([]InterfaceGenerator, error) {