docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Close #2001 / consistent hyperv internal naming 

Signed-off-by: David Arnold <dar@devco.co>
This commit is contained in:
David Arnold 2015-10-18 11:24:41 -05:00
parent 43543d1579
commit ab79c4d9c1
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/hyperv/hyperv.go
View File

@ -47,24 +47,24 @@ func NewDriver(hostName, storePath string) drivers.Driver {
func (d *Driver) GetCreateFlags() []mcnflag.Flag { func (d *Driver) GetCreateFlags() []mcnflag.Flag {
return []mcnflag.Flag{ return []mcnflag.Flag{
mcnflag.StringFlag{ mcnflag.StringFlag{
Name: "hyper-v-boot2docker-url", Name: "hyperv-boot2docker-url",
Usage: "Hyper-V URL of the boot2docker image. Defaults to the latest available version.", Usage: "Hyper-V URL of the boot2docker image. Defaults to the latest available version.",
}, },
mcnflag.StringFlag{ mcnflag.StringFlag{
Name: "hyper-v-boot2docker-location", Name: "hyperv-boot2docker-location",
Usage: "Hyper-V local boot2docker iso. Overrides URL.", Usage: "Hyper-V local boot2docker iso. Overrides URL.",
}, },
mcnflag.StringFlag{ mcnflag.StringFlag{
Name: "hyper-v-virtual-switch", Name: "hyperv-virtual-switch",
Usage: "Hyper-V virtual switch name. Defaults to first found.", Usage: "Hyper-V virtual switch name. Defaults to first found.",
}, },
mcnflag.IntFlag{ mcnflag.IntFlag{
Name: "hyper-v-disk-size", Name: "hyperv-disk-size",
Usage: "Hyper-V disk size for host in MB.", Usage: "Hyper-V disk size for host in MB.",
Value: defaultDiskSize, Value: defaultDiskSize,
}, },
mcnflag.IntFlag{ mcnflag.IntFlag{
Name: "hyper-v-memory", Name: "hyperv-memory",
Usage: "Hyper-V memory size for host in MB.", Usage: "Hyper-V memory size for host in MB.",
Value: defaultMemory, Value: defaultMemory,
}, },
@ -72,11 +72,11 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
} }
func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error { func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.boot2DockerURL = flags.String("hyper-v-boot2docker-url") d.boot2DockerURL = flags.String("hyperv-boot2docker-url")
d.boot2DockerLoc = flags.String("hyper-v-boot2docker-location") d.boot2DockerLoc = flags.String("hyperv-boot2docker-location")
d.vSwitch = flags.String("hyper-v-virtual-switch") d.vSwitch = flags.String("hyperv-virtual-switch")
d.DiskSize = flags.Int("hyper-v-disk-size") d.DiskSize = flags.Int("hyperv-disk-size")
d.MemSize = flags.Int("hyper-v-memory") d.MemSize = flags.Int("hyperv-memory")
d.SwarmMaster = flags.Bool("swarm-master") d.SwarmMaster = flags.Bool("swarm-master")
d.SwarmHost = flags.String("swarm-host") d.SwarmHost = flags.String("swarm-host")
d.SwarmDiscovery = flags.String("swarm-discovery") d.SwarmDiscovery = flags.String("swarm-discovery")
@ -98,7 +98,7 @@ func (d *Driver) GetSSHUsername() string {
} }
func (d *Driver) DriverName() string { func (d *Driver) DriverName() string {
return "hyper-v" return "hyperv"
} }
func (d *Driver) PreCreateCheck() error { func (d *Driver) PreCreateCheck() error {