1
0
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00

move auto-formatter drive selection logic to os-autoformat container

and get rid of:
- machine-rancheros.iso,
- special case in build-images,
- some bootstrap.go code
This commit is contained in:
Ivan Mikushin
2015-07-21 20:43:20 +05:00
parent dbae0a6012
commit d33698d17b
6 changed files with 53 additions and 104 deletions

View File

@@ -52,7 +52,8 @@ type Repositories map[string]Repository
type Config struct {
Environment map[string]string `yaml:"environment,omitempty"`
Services map[string]*project.ServiceConfig `yaml:"services,omitempty"`
BootstrapContainers map[string]*project.ServiceConfig `yaml:"bootstrap_containers,omitempty"`
BootstrapContainers map[string]*project.ServiceConfig `yaml:"bootstrap,omitempty"`
Autoformat map[string]*project.ServiceConfig `yaml:"autoformat,omitempty"`
BootstrapDocker DockerConfig `yaml:"bootstrap_docker,omitempty"`
CloudInit CloudInit `yaml:"cloud_init,omitempty"`
Console ConsoleConfig `yaml:"console,omitempty"`
@@ -124,6 +125,7 @@ type StateConfig struct {
Dev string `yaml:"dev,omitempty"`
Required bool `yaml:"required,omitempty"`
Autoformat []string `yaml:"autoformat,omitempty"`
FormatZero bool `yaml:"formatzero,omitempty"`
}
type CloudInit struct {