~rogpeppe/juju-core/azure

« back to all changes in this revision

Viewing changes to state/apiserver/client/client.go

[r=wallyworld] Add container support to force-machine

The deploy --force-machine option now supports containers,
either deploying to existing containers or creating new
ones on nominated machines.

Example syntax:

 juju deploy mysql --force-machine 23
 juju deploy mysql --force-machine 24/lxc/3
 juju deploy mysql --force-machine lxc:25

The last example creates a new lxc container on
machine 25.

The add-machine syntax has been tweaked to remove the
leading "/" from the container arg.

https://codereview.appspot.com/10777044/

Show diffs side-by-side

added added

removed removed

Lines of Context:
172
172
                return err
173
173
        }
174
174
        _, err = conn.DeployService(juju.DeployServiceParams{
175
 
                ServiceName:    args.ServiceName,
176
 
                Charm:          ch,
177
 
                NumUnits:       args.NumUnits,
178
 
                ConfigSettings: settings,
179
 
                Constraints:    args.Constraints,
180
 
                ForceMachineId: args.ForceMachineId,
 
175
                ServiceName:      args.ServiceName,
 
176
                Charm:            ch,
 
177
                NumUnits:         args.NumUnits,
 
178
                ConfigSettings:   settings,
 
179
                Constraints:      args.Constraints,
 
180
                ForceMachineSpec: args.ForceMachineSpec,
181
181
        })
182
182
        return err
183
183
}