rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-10 11:03:16 +00:00
Code Issues Releases Wiki Activity

Move default hostname and network under common key

Browse Source
This commit is contained in:
Josh Curl 2016-05-03 08:55:15 -07:00
parent 97344cc535
commit e51c5409aa
No known key found for this signature in database
GPG Key ID: 82B504B9BCCFA677
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/network/network.go
View File

@ -56,8 +56,8 @@ func Main() {
search := cfg.Rancher.Network.Dns.Search search := cfg.Rancher.Network.Dns.Search
userSetDns := len(nameservers) > 0 || len(search) > 0 userSetDns := len(nameservers) > 0 || len(search) > 0
if !userSetDns { if !userSetDns {
nameservers = cfg.Rancher.DefaultNetwork.Dns.Nameservers nameservers = cfg.Rancher.Defaults.Network.Dns.Nameservers
search = cfg.Rancher.DefaultNetwork.Dns.Search search = cfg.Rancher.Defaults.Network.Dns.Search
} }
if _, err := resolvconf.Build("/etc/resolv.conf", nameservers, search, nil); err != nil { if _, err := resolvconf.Build("/etc/resolv.conf", nameservers, search, nil); err != nil {

7
config/types.go
View File

@ -78,7 +78,6 @@ type CloudConfig struct {
SSHAuthorizedKeys []string `yaml:"ssh_authorized_keys"` SSHAuthorizedKeys []string `yaml:"ssh_authorized_keys"`
WriteFiles []config.File `yaml:"write_files"` WriteFiles []config.File `yaml:"write_files"`
Hostname string `yaml:"hostname"` Hostname string `yaml:"hostname"`
DefaultHostname string `yaml:"default_hostname"`
Rancher RancherConfig `yaml:"rancher,omitempty"` Rancher RancherConfig `yaml:"rancher,omitempty"`
} }
@ -105,6 +104,7 @@ type RancherConfig struct {
SystemDocker DockerConfig `yaml:"system_docker,omitempty"` SystemDocker DockerConfig `yaml:"system_docker,omitempty"`
Upgrade UpgradeConfig `yaml:"upgrade,omitempty"` Upgrade UpgradeConfig `yaml:"upgrade,omitempty"`
Docker DockerConfig `yaml:"docker,omitempty"` Docker DockerConfig `yaml:"docker,omitempty"`
Defaults Defaults `yaml:"defaults,omitempty"`
} }
type UpgradeConfig struct { type UpgradeConfig struct {
@ -148,6 +148,11 @@ type CloudInit struct {
Datasources []string `yaml:"datasources,omitempty"` Datasources []string `yaml:"datasources,omitempty"`
} }
type Defaults struct {
Hostname string `yaml:"hostname,omitempty"`
Network netconf.NetworkConfig `yaml:"network,omitempty"`
}
func (r Repositories) ToArray() []string { func (r Repositories) ToArray() []string {
result := make([]string, 0, len(r)) result := make([]string, 0, len(r))
for _, repo := range r { for _, repo := range r {

5
hostname/hostname.go
View File

@ -2,17 +2,18 @@ package hostname
import ( import (
"bufio" "bufio"
"github.com/rancher/os/config"
"io/ioutil" "io/ioutil"
"os" "os"
"strings" "strings"
"syscall" "syscall"
"github.com/rancher/os/config"
) )
func SetHostnameFromCloudConfig(cc *config.CloudConfig) error { func SetHostnameFromCloudConfig(cc *config.CloudConfig) error {
var hostname string var hostname string
if cc.Hostname == "" { if cc.Hostname == "" {
hostname = cc.DefaultHostname hostname = cc.Rancher.Defaults.Hostname
} else { } else {
hostname = cc.Hostname hostname = cc.Hostname
} }

4
init/init.go
View File

@ -164,8 +164,8 @@ func getLaunchConfig(cfg *config.CloudConfig, dockerCfg *config.DockerConfig) (*
args := dockerlaunch.ParseConfig(&launchConfig, append(dockerCfg.Args, dockerCfg.ExtraArgs...)...) args := dockerlaunch.ParseConfig(&launchConfig, append(dockerCfg.Args, dockerCfg.ExtraArgs...)...)
launchConfig.DnsConfig.Nameservers = cfg.Rancher.DefaultNetwork.Dns.Nameservers launchConfig.DnsConfig.Nameservers = cfg.Rancher.Defaults.Network.Dns.Nameservers
launchConfig.DnsConfig.Search = cfg.Rancher.DefaultNetwork.Dns.Search launchConfig.DnsConfig.Search = cfg.Rancher.Defaults.Network.Dns.Search
launchConfig.Environment = dockerCfg.Environment launchConfig.Environment = dockerCfg.Environment
launchConfig.EmulateSystemd = true launchConfig.EmulateSystemd = true

9
os-config.tpl.yml
View File

@ -1,5 +1,9 @@
default_hostname: {{.HOSTNAME_DEFAULT}}
rancher: rancher:
defaults:
hostname: {{.HOSTNAME_DEFAULT}}
network:
dns:
nameservers: [8.8.8.8, 8.8.4.4]
bootstrap: bootstrap:
state-script: state-script:
image: {{.OS_REPO}}/os-statescript:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-statescript:{{.VERSION}}{{.SUFFIX}}
@ -61,9 +65,6 @@ rancher:
cloud_init: cloud_init:
datasources: datasources:
- configdrive:/media/config-2 - configdrive:/media/config-2
default_network:
dns:
nameservers: [8.8.8.8, 8.8.4.4]
repositories: repositories:
core: core:
url: {{.OS_SERVICES_REPO}}/{{.REPO_VERSION}}{{.SUFFIX}} url: {{.OS_SERVICES_REPO}}/{{.REPO_VERSION}}{{.SUFFIX}}