1
0
mirror of https://github.com/rancher/os.git synced 2025-06-28 15:56:58 +00:00

Add sysctl support in cloud config

This commit is contained in:
Josh Curl 2016-06-17 23:05:45 -07:00
parent eb0c262ef7
commit 921c00c8ea
No known key found for this signature in database
GPG Key ID: 82B504B9BCCFA677
5 changed files with 39 additions and 0 deletions

View File

@ -19,8 +19,10 @@ import (
"errors"
"flag"
"fmt"
"io/ioutil"
"os"
"os/exec"
"path"
"strings"
"sync"
"time"
@ -227,6 +229,15 @@ func executeCloudConfig() error {
}
}
for k, v := range cc.Rancher.Sysctl {
elems := []string{"/proc", "sys"}
elems = append(elems, strings.Split(k, ".")...)
path := path.Join(elems...)
if err := ioutil.WriteFile(path, []byte(v), 0644); err != nil {
log.Errorf("Failed to set sysctl key %s: %s", k, err)
}
}
return nil
}

View File

@ -206,6 +206,9 @@ func amendNils(c *CloudConfig) *CloudConfig {
if t.Rancher.RegistryAuths == nil {
t.Rancher.RegistryAuths = map[string]types.AuthConfig{}
}
if t.Rancher.Sysctl == nil {
t.Rancher.Sysctl = map[string]string{}
}
return &t
}

View File

@ -112,6 +112,7 @@ type RancherConfig struct {
RegistryAuths map[string]types.AuthConfig `yaml:"registry_auths,omitempty"`
Defaults Defaults `yaml:"defaults,omitempty"`
ResizeDevice string `yaml:"resize_device,omitempty"`
Sysctl map[string]string `yaml:"sysctl,omitempty"`
}
type UpgradeConfig struct {

View File

@ -0,0 +1,7 @@
#cloud-config
rancher:
sysctl:
kernel.domainname: test
dev.cdrom.debug: 1
ssh_authorized_keys:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF

View File

@ -0,0 +1,17 @@
import pytest
import rostest.util as u
from rostest.util import SSH
cloud_config_path = './tests/integration/assets/test_20/cloud-config.yml'
@pytest.fixture(scope="module")
def qemu(request):
q = u.run_qemu(request, run_args=['--cloud-config', cloud_config_path])
u.flush_out(q.stdout)
return q
def test_sysctl(qemu):
SSH(qemu).check_call("sudo cat /proc/sys/kernel/domainname | grep test")
SSH(qemu).check_call("sudo cat /proc/sys/dev/cdrom/debug | grep 1")