mirror of
https://github.com/rancher/os.git
synced 2025-09-20 01:54:53 +00:00
Merge pull request #669 from imikushin/dns-no-reboot
Configure DNS nameservers with DHCP or cloud-config
This commit is contained in:
2
Godeps/Godeps.json
generated
2
Godeps/Godeps.json
generated
@@ -368,7 +368,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/rancher/netconf",
|
"ImportPath": "github.com/rancher/netconf",
|
||||||
"Rev": "b9aeb623c8ef9551d79efec57ee059658c1ac89c"
|
"Rev": "02925e7cf5a0f0bb0aa5360ee260ef7378e5eff8"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/ryanuber/go-glob",
|
"ImportPath": "github.com/ryanuber/go-glob",
|
||||||
|
1
Godeps/_workspace/src/github.com/rancher/netconf/types.go
generated
vendored
1
Godeps/_workspace/src/github.com/rancher/netconf/types.go
generated
vendored
@@ -16,6 +16,7 @@ type InterfaceConfig struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type DnsConfig struct {
|
type DnsConfig struct {
|
||||||
|
Override bool `yaml:"override"`
|
||||||
Nameservers []string `yaml:"nameservers,flow,omitempty"`
|
Nameservers []string `yaml:"nameservers,flow,omitempty"`
|
||||||
Search []string `yaml:"search,flow,omitempty"`
|
Search []string `yaml:"search,flow,omitempty"`
|
||||||
}
|
}
|
||||||
|
@@ -7,6 +7,7 @@ import (
|
|||||||
|
|
||||||
log "github.com/Sirupsen/logrus"
|
log "github.com/Sirupsen/logrus"
|
||||||
|
|
||||||
|
"github.com/docker/libnetwork/resolvconf"
|
||||||
"github.com/rancher/netconf"
|
"github.com/rancher/netconf"
|
||||||
"github.com/rancher/os/cmd/cloudinit"
|
"github.com/rancher/os/cmd/cloudinit"
|
||||||
"github.com/rancher/os/config"
|
"github.com/rancher/os/config"
|
||||||
@@ -37,7 +38,13 @@ func Main() {
|
|||||||
}
|
}
|
||||||
cloudinit.SetHostname(cfg) // ignore error
|
cloudinit.SetHostname(cfg) // ignore error
|
||||||
if err := netconf.ApplyNetworkConfigs(&cfg.Rancher.Network); err != nil {
|
if err := netconf.ApplyNetworkConfigs(&cfg.Rancher.Network); err != nil {
|
||||||
log.Fatal(err)
|
log.Error(err)
|
||||||
|
}
|
||||||
|
if cfg.Rancher.Network.Dns.Override {
|
||||||
|
log.WithFields(log.Fields{"nameservers": cfg.Rancher.Network.Dns.Nameservers}).Info("Override nameservers")
|
||||||
|
if err := resolvconf.Build("/etc/resolv.conf", cfg.Rancher.Network.Dns.Nameservers, cfg.Rancher.Network.Dns.Search); err != nil {
|
||||||
|
log.Error(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if _, err := os.Create(NETWORK_DONE); err != nil {
|
if _, err := os.Create(NETWORK_DONE); err != nil {
|
||||||
log.Error(err)
|
log.Error(err)
|
||||||
|
@@ -244,6 +244,7 @@ rancher:
|
|||||||
volumes:
|
volumes:
|
||||||
- /dev:/host/dev
|
- /dev:/host/dev
|
||||||
- /etc/docker:/etc/docker
|
- /etc/docker:/etc/docker
|
||||||
|
- /etc/resolv.conf:/etc/resolv.conf
|
||||||
- /etc/rkt:/etc/rkt
|
- /etc/rkt:/etc/rkt
|
||||||
- /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt.rancher
|
- /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt.rancher
|
||||||
- /lib/firmware:/lib/firmware
|
- /lib/firmware:/lib/firmware
|
||||||
|
Reference in New Issue
Block a user