~thumper/juju-core/more-errgo

« back to all changes in this revision

Viewing changes to worker/provisioner/kvm-broker.go

[r=thumper] Have container provisioners support proxies

Container provisioners need to get the proxy information, and need to set this in the MachineConfig. This comes from the ContainerConfig api call.

Also, the special casing for the containers apt proxy support has been removed, as this is now handled in the much more general case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
85
85
                config.AuthorizedKeys,
86
86
                config.SSLHostnameVerification,
87
87
                config.SyslogPort,
 
88
                config.Proxy,
 
89
                config.AptProxy,
88
90
        ); err != nil {
89
91
                kvmLogger.Errorf("failed to populate machine config: %v", err)
90
92
                return nil, nil, err