rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00
Code Issues Releases Wiki Activity

Rebase on rancher/netconf

Browse Source
This commit is contained in:
Darren Shepherd
2015-07-29 00:45:06 -07:00
parent 0f6668be43
commit 889c80b682
4 changed files with 9 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
config/types.go
View File

@@ -2,6 +2,7 @@ package config
import (
"github.com/coreos/coreos-cloudinit/config"
"github.com/rancher/netconf"
"github.com/rancherio/rancher-compose/librcompose/project"
)
@@ -76,7 +77,7 @@ type RancherConfig struct {
Disable []string `yaml:"disable,omitempty"`
ServicesInclude map[string]bool `yaml:"services_include,omitempty"`
Modules []string `yaml:"modules,omitempty"`
Network NetworkConfig `yaml:"network,omitempty"`
Network netconf.NetworkConfig `yaml:"network,omitempty"`
Repositories Repositories `yaml:"repositories,omitempty"`
Ssh SshConfig `yaml:"ssh,omitempty"`
State StateConfig `yaml:"state,omitempty"`
@@ -97,28 +98,6 @@ type UpgradeConfig struct {
Rollback string `yaml:"rollback,omitempty"`
}
type DnsConfig struct {
Nameservers []string `yaml:"nameservers,flow,omitempty"`
Search []string `yaml:"search,flow,omitempty"`
Domain string `yaml:"domain,omitempty"`
}
type NetworkConfig struct {
Dns DnsConfig `yaml:"dns,omitempty"`
Interfaces map[string]InterfaceConfig `yaml:"interfaces,omitempty"`
PostRun *ContainerConfig `yaml:"post_run,omitempty"`
}
type InterfaceConfig struct {
Match string `yaml:"match,omitempty"`
DHCP bool `yaml:"dhcp,omitempty"`
Address string `yaml:"address,omitempty"`
IPV4LL bool `yaml:"ipv4ll,omitempty"`
Gateway string `yaml:"gateway,omitempty"`
MTU int `yaml:"mtu,omitempty"`
Bridge bool `yaml:"bridge,omitempty"`
}
type DockerConfig struct {
TLS bool `yaml:"tls,omitempty"`
TLSArgs []string `yaml:"tls_args,flow,omitempty"`