fix import

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
This commit is contained in:
Василий Толстов 2015-11-09 08:24:52 +00:00
parent 668f322607
commit d407b82968
63 changed files with 92 additions and 92 deletions

4
build
View File

@ -1,7 +1,7 @@
#!/bin/bash -ex
ORG_PATH="github.com/vtolstov"
REPO_PATH="${ORG_PATH}/cloudinit"
ORG_PATH="github.com/coreos"
REPO_PATH="${ORG_PATH}/coreos-cloudinit"
VERSION=$(git describe --tags)
GLDFLAGS="-X main.version \"${VERSION}\""

View File

@ -39,7 +39,7 @@ import (
"github.com/coreos/coreos-cloudinit/network"
"github.com/coreos/coreos-cloudinit/pkg"
"github.com/coreos/coreos-cloudinit/system"
"github.com/vtolstov/cloudinit/datasource/metadata/openstack"
"github.com/coreos/coreos-cloudinit/datasource/metadata/openstack"
)
const (

View File

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

View File

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

View File

@ -21,7 +21,7 @@ import (
"strconv"
"strings"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
yaml "gopkg.in/yaml.v2"
)

View File

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

View File

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

View File

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

View File

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

View File

@ -20,10 +20,10 @@ import (
"reflect"
"testing"
"github.com/vtolstov/cloudinit/datasource"
"github.com/vtolstov/cloudinit/datasource/metadata"
"github.com/vtolstov/cloudinit/datasource/metadata/test"
"github.com/vtolstov/cloudinit/pkg"
"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"
)
func TestType(t *testing.T) {

View File

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

View File

@ -20,10 +20,10 @@ import (
"reflect"
"testing"
"github.com/vtolstov/cloudinit/datasource"
"github.com/vtolstov/cloudinit/datasource/metadata"
"github.com/vtolstov/cloudinit/datasource/metadata/test"
"github.com/vtolstov/cloudinit/pkg"
"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"
)
func TestType(t *testing.T) {

View File

@ -17,7 +17,7 @@ package metadata
import (
"strings"
"github.com/vtolstov/cloudinit/pkg"
"github.com/coreos/coreos-cloudinit/pkg"
)
type MetadataService struct {

View File

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

View File

@ -21,8 +21,8 @@ import (
"net"
"strconv"
"github.com/vtolstov/cloudinit/datasource"
"github.com/vtolstov/cloudinit/datasource/metadata"
"github.com/coreos/coreos-cloudinit/datasource"
"github.com/coreos/coreos-cloudinit/datasource/metadata"
)
const (

View File

@ -21,9 +21,9 @@ import (
"fmt"
"testing"
"github.com/vtolstov/cloudinit/datasource/metadata"
"github.com/vtolstov/cloudinit/datasource/metadata/test"
"github.com/vtolstov/cloudinit/pkg"
"github.com/coreos/coreos-cloudinit/datasource/metadata"
"github.com/coreos/coreos-cloudinit/datasource/metadata/test"
"github.com/coreos/coreos-cloudinit/pkg"
)
func TestType(t *testing.T) {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -19,7 +19,7 @@ import (
"log"
"net"
"github.com/vtolstov/cloudinit/datasource/metadata/digitalocean"
"github.com/coreos/coreos-cloudinit/datasource/metadata/digitalocean"
)
func ProcessDigitalOceanNetconf(config digitalocean.Metadata) ([]InterfaceGenerator, error) {

View File

@ -20,7 +20,7 @@ import (
"reflect"
"testing"
"github.com/vtolstov/cloudinit/datasource/metadata/digitalocean"
"github.com/coreos/coreos-cloudinit/datasource/metadata/digitalocean"
)
func TestParseNameservers(t *testing.T) {

View File

@ -18,7 +18,7 @@ import (
"fmt"
"reflect"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
// serviceContents generates the contents for a drop-in unit given the config.

View File

@ -22,7 +22,7 @@ import (
"syscall"
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
const (

View File

@ -20,7 +20,7 @@ import (
"os"
"path"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
const DefaultIpv4Address = "127.0.0.1"

View File

@ -20,7 +20,7 @@ import (
"reflect"
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func TestEtcdHostsFile(t *testing.T) {

View File

@ -15,7 +15,7 @@
package system
import (
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
// Etcd is a top-level structure which embeds its underlying configuration,

View File

@ -18,7 +18,7 @@ import (
"reflect"
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func TestEtcdUnits(t *testing.T) {

View File

@ -23,7 +23,7 @@ import (
"path"
"strconv"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
// File is a top-level structure which embeds its underlying configuration,

View File

@ -20,7 +20,7 @@ import (
"path"
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func TestWriteFileUnencodedContent(t *testing.T) {

View File

@ -18,7 +18,7 @@ import (
"path"
"strings"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
// flannel is a top-level structure which embeds its underlying configuration,

View File

@ -18,7 +18,7 @@ import (
"reflect"
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func TestFlannelEnvVars(t *testing.T) {

View File

@ -15,7 +15,7 @@
package system
import (
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
// Fleet is a top-level structure which embeds its underlying configuration,

View File

@ -18,7 +18,7 @@ import (
"reflect"
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func TestFleetUnits(t *testing.T) {

View File

@ -15,7 +15,7 @@
package system
import (
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
// Locksmith is a top-level structure which embeds its underlying configuration,

View File

@ -18,7 +18,7 @@ import (
"reflect"
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func TestLocksmithUnits(t *testing.T) {

View File

@ -14,7 +14,7 @@
package system
import "github.com/vtolstov/cloudinit/network"
import "github.com/coreos/coreos-cloudinit/network"
func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) {
return nil

View File

@ -21,8 +21,8 @@ import (
"strings"
"github.com/vishvananda/netlink"
"github.com/vtolstov/cloudinit/config"
"github.com/vtolstov/cloudinit/network"
"github.com/coreos/coreos-cloudinit/config"
"github.com/coreos/coreos-cloudinit/network"
)
func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) {

View File

@ -14,7 +14,7 @@
package system
import "github.com/vtolstov/cloudinit/network"
import "github.com/coreos/coreos-cloudinit/network"
func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) {
return nil

View File

@ -14,7 +14,7 @@
package system
import "github.com/vtolstov/cloudinit/network"
import "github.com/coreos/coreos-cloudinit/network"
func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) {
return nil

View File

@ -18,7 +18,7 @@ import (
"fmt"
"path"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
// OEM is a top-level structure which embeds its underlying configuration,

View File

@ -18,7 +18,7 @@ import (
"reflect"
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func TestOEMFile(t *testing.T) {

View File

@ -22,7 +22,7 @@ import (
"path"
"strings"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func NewUnitManager(root string) UnitManager {

View File

@ -21,7 +21,7 @@ import (
"path"
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func TestPlaceUnit(t *testing.T) {

View File

@ -20,7 +20,7 @@ import (
"path/filepath"
"strings"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
type UnitManager interface {

View File

@ -17,7 +17,7 @@ package system
import (
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func TestType(t *testing.T) {

View File

@ -24,7 +24,7 @@ import (
"sort"
"strings"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
const (

View File

@ -20,7 +20,7 @@ import (
"strings"
"testing"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func testReadConfig(config string) func() (io.Reader, error) {

View File

@ -18,7 +18,7 @@ import (
"os/exec"
"strings"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func UserHome(name string) (string, error) {

View File

@ -20,7 +20,7 @@ import (
"os/exec"
"strings"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func CreateUser(u *config.User) error {

View File

@ -20,7 +20,7 @@ import (
"os/exec"
"strings"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func CreateUser(u *config.User) error {

View File

@ -20,7 +20,7 @@ import (
"os/exec"
"strings"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func CreateUser(u *config.User) error {

View File

@ -20,7 +20,7 @@ import (
"os/exec"
"strings"
"github.com/vtolstov/cloudinit/config"
"github.com/coreos/coreos-cloudinit/config"
)
func CreateUser(u *config.User) error {