~rogpeppe/juju-core/themue-058-debug-log-api

« back to all changes in this revision

Viewing changes to provider/maas/environprovider.go

Committer: Frank Mueller
Date: 2014-01-23 14:14:49 UTC
mfrom: (2152.1.95 juju-core)
Revision ID: frank.mueller@canonical.com-20140123141449-b30l57y7gs3wjkpw

debugger: merged trunk and fixed permission and interface problems

files added:
environs/imagemetadata/upload.go

environs/imagemetadata/upload_test.go

state/api/base

state/api/common/environwatcher.go

state/api/common/life.go

state/api/common/testing

state/api/common/testing/environwatcher.go

state/api/firewaller

state/api/firewaller/firewaller.go

state/api/firewaller/firewaller_test.go

state/api/firewaller/machine.go

state/api/firewaller/machine_test.go

state/api/firewaller/service.go

state/api/firewaller/service_test.go

state/api/firewaller/state_test.go

state/api/firewaller/unit.go

state/api/firewaller/unit_test.go

state/apiserver/common/environmachineswatcher.go

state/apiserver/common/environmachineswatcher_test.go

state/apiserver/common/environwatcher.go

state/apiserver/common/environwatcher_test.go

state/apiserver/common/instanceidgetter.go

state/apiserver/common/instanceidgetter_test.go

state/apiserver/common/testing

state/apiserver/common/testing/environwatcher.go

state/apiserver/common/unitswatcher.go

state/apiserver/common/unitswatcher_test.go

state/apiserver/firewaller

state/apiserver/firewaller/firewaller.go

state/apiserver/firewaller/firewaller_test.go

files renamed:
environs/config/home.go => juju/osenv/home.go

environs/config/home_test.go => juju/osenv/home_test.go

state/api/common/interfaces.go => state/api/base/caller.go

files modified:
agent/format-1.16.go

agent/format-1.16_whitebox_test.go

agent/tools/tools_test.go

charm/repo.go

charm/repo_test.go

cmd/environmentcommand.go

cmd/environmentcommand_test.go

cmd/juju/authorisedkeys_test.go

cmd/juju/bootstrap.go

cmd/juju/bootstrap_test.go

cmd/juju/cmd_test.go

cmd/juju/deploy.go

cmd/juju/help_topics.go

cmd/juju/main.go

cmd/juju/main_test.go

cmd/juju/plugin.go

cmd/jujud/machine.go

cmd/jujud/main.go

cmd/logging.go

cmd/logging_test.go

cmd/package_test.go

cmd/plugins/juju-metadata/imagemetadata.go

cmd/plugins/juju-metadata/metadataplugin_test.go

cmd/plugins/juju-metadata/toolsmetadata.go

cmd/plugins/juju-metadata/toolsmetadata_test.go

cmd/plugins/juju-metadata/validatetoolsmetadata_test.go

dependencies.tsv

environs/boilerplate_config_test.go

environs/cloudinit.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/cloudinit_test.go

environs/config.go

environs/config/config.go

environs/config/config_test.go

environs/configstore/disk.go

environs/imagemetadata/generate.go

environs/imagemetadata/generate_test.go

environs/imagemetadata/testing/testing.go

environs/imagemetadata/urls.go

environs/imagemetadata/urls_test.go

environs/simplestreams/simplestreams.go

environs/tools/boilerplate.go

environs/tools/validation_test.go

instance/instance.go

instance/instance_test.go

juju/api.go

juju/apiconn_test.go

juju/conn.go

juju/conn_test.go

juju/osenv/proxy.go

juju/osenv/proxy_test.go

juju/osenv/vars.go

juju/osenv/vars_test.go

juju/testing/conn.go

provider/azure/instance.go

provider/azure/instance_test.go

provider/dummy/environs.go

provider/ec2/ec2.go

provider/ec2/local_test.go

provider/local/environ.go

provider/local/environprovider.go

provider/local/environprovider_test.go

provider/maas/environprovider.go

provider/maas/environprovider_test.go

provider/openstack/provider.go

state/api/agent/state.go

state/api/charmrevisionupdater/updater.go

state/api/deployer/deployer.go

state/api/keyupdater/authorisedkeys.go

state/api/logger/logger.go

state/api/machiner/machiner.go

state/api/params/internal.go

state/api/provisioner/provisioner.go

state/api/provisioner/provisioner_test.go

state/api/state.go

state/api/uniter/service.go

state/api/uniter/uniter.go

state/api/uniter/uniter_test.go

state/api/upgrader/upgrader.go

state/api/watcher/watcher.go

state/apiserver/client/run.go

state/apiserver/client/run_test.go

state/apiserver/common/interfaces.go

state/apiserver/debugger/debugger.go

state/apiserver/debugger/debugger_test.go

state/apiserver/debugger/logtailer.go

state/apiserver/deployer/deployer.go

state/apiserver/logger/logger_test.go

state/apiserver/provisioner/provisioner.go

state/apiserver/provisioner/provisioner_test.go

state/apiserver/root.go

state/apiserver/testing/errors.go

state/apiserver/uniter/uniter.go

state/apiserver/uniter/uniter_test.go

state/interface.go

state/state_test.go

state/unit.go

testing/environ.go

testing/environ_test.go

testing/testbase/imports.go

testing/testbase/log.go

utils/apt.go

utils/apt_test.go

utils/fslock/package_test.go

utils/ssh/ssh_gocrypto_test.go

utils/tailer/tailer.go

worker/deployer/simple.go

worker/firewaller/firewaller.go

worker/firewaller/firewaller_test.go

worker/uniter/context.go

worker/uniter/jujuc/juju-log.go

worker/uniter/jujuc/juju-log_test.go

worker/uniter/jujuc/util_test.go

Show diffs side-by-side

added added

removed removed

provider/maas/environprovider.go

func (maasEnvironProvider) hostname() (string, error) {

// Hack to get container ip addresses properly for MAAS demo.

if os.Getenv(osenv.JujuContainerType) == string(instance.LXC) {

if os.Getenv(osenv.JujuContainerTypeEnvKey) == string(instance.LXC) {

return utils.GetAddressForInterface("eth0")

}

info := machineInfo{}

Older »