~jameinel/juju-core/api-registry-tracks-type

« back to all changes in this revision

Viewing changes to environs/azure/instance.go

Committer: Tim Penhey
Date: 2013-07-11 22:23:18 UTC
mfrom: (1408.2.2 local-sudo-caller)
mto: (1263.6.3 find-jujud)
mto: This revision was merged to the branch mainline in revision 1469.
Revision ID: tim.penhey@canonical.com-20130711222318-w2gpe2i72mgu9mph

Merged local-sudo-caller into local-provider-bootstrap.

files added:
cmd/jujud/upgradevalidation.go

environs/storage.go

state/api/interfaces.go

state/apiserver/common/life.go

state/apiserver/common/life_test.go

state/apiserver/common/remove.go

state/apiserver/common/remove_test.go

testing/channel.go

testing/constants.go

utils/apt.go

utils/apt_test.go

files removed:
state/apiserver/common/export_test.go

tools

files renamed:
environs/agent/ => agent/

tools/diskmanager.go => agent/diskmanager.go

tools/diskmanager_test.go => agent/diskmanager_test.go

tools/interfaces.go => agent/interfaces.go

tools/tools_test.go => agent/tools_compat_test.go

environs/storage.go => environs/emptystorage.go

environs/storage_test.go => environs/emptystorage_test.go

files modified:
CONTRIBUTING

agent/agent.go

agent/agent_test.go

agent/tools_test.go

bzr/bzr_test.go

cert/cert_test.go

charm/bundle_test.go

charm/charm_test.go

charm/config.go

charm/config_test.go

charm/dir.go

charm/dir_test.go

charm/meta.go

charm/meta_test.go

charm/repo.go

charm/repo_test.go

charm/url.go

charm/url_test.go

cloudinit/cloudinit_test.go

cmd/builddb/main.go

cmd/charmd/main.go

cmd/cmd.go

cmd/cmd_test.go

cmd/filevar_test.go

cmd/juju/publish_test.go

cmd/juju/scp_test.go

cmd/juju/ssh_test.go

cmd/juju/status_test.go

cmd/jujud/agent.go

cmd/jujud/agent_test.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/jujud/unit_test.go

cmd/jujud/upgrade.go

cmd/jujud/upgrade_test.go

cmd/logging_test.go

cmd/output.go

cmd/output_test.go

cmd/supercommand.go

cmd/supercommand_test.go

cmd/util_test.go

cmd/version.go

cmd/version_test.go

constraints/constraints.go

constraints/constraints_test.go

container/lxc/lxc_test.go

downloader/downloader.go

downloader/downloader_test.go

environs/azure/environ.go

environs/azure/environ_test.go

environs/azure/instance.go

environs/azure/instance_test.go

environs/azure/storage.go

environs/azure/storage_test.go

environs/boilerplate_config_test.go

environs/bootstrap.go

environs/cert.go

environs/cert_internal_test.go

environs/cert_test.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/cloudinit_test.go

environs/config.go

environs/config_test.go

environs/dummy/environs.go

environs/dummy/storage.go

environs/ec2/ec2.go

environs/ec2/export_test.go

environs/ec2/image.go

environs/ec2/live_test.go

environs/ec2/storage.go

environs/instances/image.go

environs/interface.go

environs/jujutest/livetests.go

environs/localstorage/storage.go

environs/localstorage/storage_test.go

environs/maas/config_test.go

environs/maas/environ.go

environs/maas/environ_test.go

environs/maas/environprovider_test.go

environs/maas/storage.go

environs/maas/storage_test.go

environs/mongo_test.go

environs/open.go

environs/open_test.go

environs/openstack/export_test.go

environs/openstack/local_test.go

environs/openstack/provider.go

environs/openstack/storage.go

environs/state.go

environs/state_test.go

environs/suite_test.go

environs/tools.go

environs/tools/list_test.go

environs/tools_test.go

instance/container_test.go

juju/api.go

juju/apiconn_test.go

juju/conn.go

juju/conn_test.go

juju/testing/conn.go

log/log_test.go

rpc/client.go

rpc/methods.go

rpc/rpc_test.go

rpc/server.go

schema/schema_test.go

state/annotator.go

state/annotator_test.go

state/api/machineagent/state.go

state/api/machineagent/state_test.go

state/api/machiner/machine.go

state/api/machiner/machiner.go

state/api/machiner/machiner_test.go

state/api/params/internal.go

state/api/params/params_test.go

state/api/upgrader/upgrader.go

state/api/upgrader/upgrader_test.go

state/api/watcher/watcher.go

state/api/watcher/watcher_test.go

state/apiserver/common/interfaces.go

state/apiserver/common/password.go

state/apiserver/common/password_test.go

state/apiserver/machine/agent.go

state/apiserver/machine/agent_test.go

state/apiserver/machine/machiner.go

state/apiserver/machine/machiner_test.go

state/apiserver/root.go

state/apiserver/server_test.go

state/apiserver/upgrader/upgrader.go

state/apiserver/upgrader/upgrader_test.go

state/apiserver/watcher.go

state/assign_test.go

state/bench_test.go

state/charm.go

state/charm_test.go

state/conn_test.go

state/constraints.go

state/container.go

state/endpoint.go

state/endpoint_test.go

state/environ.go

state/environ_test.go

state/export_test.go

state/initialize_test.go

state/life.go

state/life_test.go

state/machine.go

state/machine_test.go

state/megawatcher.go

state/megawatcher_internal_test.go

state/minimumunits.go

state/minimumunits_test.go

state/open.go

state/relation.go

state/relation_internal_test.go

state/relation_test.go

state/relationunit.go

state/relationunit_test.go

state/sequence.go

state/service.go

state/service_test.go

state/settings.go

state/settings_test.go

state/state.go

state/state_test.go

state/status.go

state/testing/watcher.go

state/tools_test.go

state/unit.go

state/unit_test.go

state/user.go

state/user_test.go

state/watcher.go

store/branch.go

store/branch_test.go

store/lpad.go

store/lpad_test.go

store/mgo_test.go

store/server.go

store/server_test.go

store/store.go

store/store_test.go

testing/cert.go

testing/charm.go

testing/cmd.go

testing/environ.go

testing/environ_test.go

testing/git.go

testing/http.go

testing/instance.go

testing/locking_test.go

testing/mgo.go

testing/mgo_test.go

upstart/upstart_test.go

utils/file_test.go

utils/network_test.go

utils/password.go

utils/trivial.go

utils/trivial_test.go

utils/uuid_test.go

version/current_test.go

version/version.go

version/version_test.go

worker/cleaner/cleaner.go

worker/deployer/simple.go

worker/deployer/simple_test.go

worker/environ.go

worker/environ_test.go

worker/firewaller/firewaller.go

worker/machiner/machiner.go

worker/machiner/machiner_test.go

worker/notifyworker.go

worker/notifyworker_test.go

worker/provisioner/lxc-broker.go

worker/provisioner/lxc-broker_test.go

worker/provisioner/provisioner.go

worker/runner.go

worker/runner_test.go

worker/uniter/context_test.go

worker/uniter/filter_test.go

worker/uniter/jujuc/unit-get_test.go

worker/uniter/jujuc/util_test.go

worker/uniter/relationer_test.go

worker/uniter/tools_test.go

worker/uniter/uniter.go

worker/uniter/uniter_test.go

Show diffs side-by-side

added added

removed removed

environs/azure/instance.go

package azure

import (

"fmt"

"launchpad.net/gwacl"

"launchpad.net/juju-core/environs"

"launchpad.net/juju-core/instance"

if err != nil {

return "", err

}

if label == "" {

if isProvisionalServiceLabel(label) {

// DNS name has not been registered yet. Come back later.

return "", instance.ErrNoDNSName

}

return fmt.Sprintf("%s.%s", label, AZURE_DOMAIN_NAME), nil

return label, nil

}

// WaitDNSName is specified in the Instance interface.

Older »