1
0
mirror of https://github.com/rancher/os.git synced 2025-09-12 21:23:13 +00:00

make cloud-config the configuration mechanism for RancherOS

This commit is contained in:
Ivan Mikushin
2015-07-29 11:52:15 +05:00
parent 5d93d51fc5
commit 7ad60c07bd
24 changed files with 919 additions and 917 deletions

View File

@@ -9,7 +9,7 @@ import (
)
type ContainerFactory struct {
cfg *config.Config
cfg *config.CloudConfig
}
type containerBasedService struct {
@@ -18,10 +18,10 @@ type containerBasedService struct {
project *project.Project
container *Container
serviceConfig *project.ServiceConfig
cfg *config.Config
cfg *config.CloudConfig
}
func NewContainerFactory(cfg *config.Config) *ContainerFactory {
func NewContainerFactory(cfg *config.CloudConfig) *ContainerFactory {
return &ContainerFactory{
cfg: cfg,
}
@@ -34,7 +34,7 @@ func (c *containerBasedService) Up() error {
fakeCreate := false
create := containerCfg.CreateOnly
if util.Contains(c.cfg.Disable, c.name) {
if util.Contains(c.cfg.Rancher.Disable, c.name) {
fakeCreate = true
}