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

Merge pull request #876 from rancher/revert-870-check-validity-of-service-name

Browse Source 
Revert "Check the validity of the service name"
This commit is contained in:
Darren Shepherd 2016-04-12 10:02:08 -07:00
commit 0c4057346a
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/control/service.go
View File

@ -95,7 +95,7 @@ func disable(c *cli.Context) {
for _, service := range c.Args() { for _, service := range c.Args() {
if _, ok := cfg.Rancher.ServicesInclude[service]; !ok { if _, ok := cfg.Rancher.ServicesInclude[service]; !ok {
logrus.Fatalf("ERROR: Service %s is not a valid service, use \"sudo ros service list\" to list the services", service) continue
} }
cfg.Rancher.ServicesInclude[service] = false cfg.Rancher.ServicesInclude[service] = false
@ -118,7 +118,7 @@ func del(c *cli.Context) {
for _, service := range c.Args() { for _, service := range c.Args() {
if _, ok := cfg.Rancher.ServicesInclude[service]; !ok { if _, ok := cfg.Rancher.ServicesInclude[service]; !ok {
logrus.Fatalf("ERROR: Service %s is not a valid service, use \"sudo ros service list\" to list the services", service) continue
} }
delete(cfg.Rancher.ServicesInclude, service) delete(cfg.Rancher.ServicesInclude, service)
changed = true changed = true
@ -137,11 +137,6 @@ func enable(c *cli.Context) {
logrus.Fatal(err) logrus.Fatal(err)
} }
services, err := util.GetServices(cfg.Rancher.Repositories.ToArray())
if err != nil {
logrus.Fatalf("Failed to get services: %v", err)
}
var enabledServices []string var enabledServices []string
for _, service := range c.Args() { for _, service := range c.Args() {
@ -150,10 +145,6 @@ func enable(c *cli.Context) {
logrus.Fatalf("ERROR: Service should be in path /var/lib/rancher/conf") logrus.Fatalf("ERROR: Service should be in path /var/lib/rancher/conf")
} }
if !util.Contains(services, service) {
logrus.Fatalf("ERROR: Service %s is not a valid service, use \"sudo ros service list\" to list the services", service)
}
cfg.Rancher.ServicesInclude[service] = true cfg.Rancher.ServicesInclude[service] = true
enabledServices = append(enabledServices, service) enabledServices = append(enabledServices, service)
} }