← Back to branch summary

~dstroppa/juju-core/joyent-provider-storage

~dstroppa/juju-core/joyent-provider-storage

« back to all changes in this revision

Viewing changes to provider/joyent/environ.go

Committer: Daniele Stroppa
Date: 2014-01-08 15:58:10 UTC
mfrom: (1953.1.231 juju-core)
Revision ID: daniele.stroppa@joyent.com-20140108155810-xecbwrqkb5i0fyoe

Merging trunk

files added:
cloudinit/progress.go

cloudinit/progress_test.go

cloudinit/sshinit

cloudinit/sshinit/suite_test.go

cmd/args.go

cmd/args_test.go

cmd/charm-admin

cmd/charm-admin/config.go

cmd/charm-admin/config_test.go

cmd/charm-admin/deletecharm.go

cmd/charm-admin/deletecharm_test.go

cmd/charm-admin/main.go

cmd/charm-admin/suite_test.go

cmd/juju/authorisedkeys.go

cmd/juju/authorisedkeys_add.go

cmd/juju/authorisedkeys_delete.go

cmd/juju/authorisedkeys_import.go

cmd/juju/authorisedkeys_list.go

cmd/juju/authorisedkeys_test.go

cmd/juju/destroyenvironment_test.go

cmd/jujud/run.go

cmd/jujud/run_test.go

cmd/package_test.go

cmd/plugins/juju-backup

cmd/plugins/juju-backup/juju-backup

cmd/plugins/juju-restore

cmd/plugins/juju-restore/restore.go

cmd/remote.go

container/factory

container/factory/factory.go

container/factory/factory_test.go

container/factory/package_test.go

container/kvm/libvirt.go

container/kvm/live_test.go

container/testing

container/testing/common.go

doc/system-ssh-key.txt

environs/testing/bootstrap.go

juju/deploy.go

provider/maas/environ_test.go

provider/maas/export_test.go

replicaset

replicaset/replicaset.go

replicaset/replicaset_test.go

state/api/export_test.go

state/api/keymanager

state/api/keymanager/client.go

state/api/keymanager/client_test.go

state/api/keymanager/package_test.go

state/api/keyupdater

state/api/keyupdater/authorisedkeys.go

state/api/keyupdater/authorisedkeys_test.go

state/api/keyupdater/package_test.go

state/apiserver/charms.go

state/apiserver/charms_test.go

state/apiserver/client/destroy.go

state/apiserver/client/destroy_test.go

state/apiserver/client/status.go

state/apiserver/keymanager

state/apiserver/keymanager/keymanager.go

state/apiserver/keymanager/keymanager_test.go

state/apiserver/keymanager/package_test.go

state/apiserver/keymanager/testing

state/apiserver/keymanager/testing/fakesshimport.go

state/apiserver/keyupdater

state/apiserver/keyupdater/authorisedkeys.go

state/apiserver/keyupdater/authorisedkeys_test.go

state/apiserver/keyupdater/package_test.go

state/statecmd

state/statecmd/status.go

store/config.go

store/config_test.go

testing/checkers/deepequal.go

testing/checkers/deepequal_test.go

utils/command.go

utils/command_test.go

utils/parallel/try.go

utils/parallel/try_test.go

utils/ssh

utils/ssh/authorisedkeys.go

utils/ssh/authorisedkeys_test.go

utils/ssh/export_test.go

utils/ssh/fingerprint_notwin.go

utils/ssh/fingerprint_win.go

utils/ssh/generate.go

utils/ssh/generate_test.go

utils/ssh/ssh_test.go

utils/ssh/testing

utils/ssh/testing/keys.go

utils/tailer

utils/tailer/export_test.go

utils/tailer/tailer.go

utils/tailer/tailer_test.go

worker/authenticationworker

worker/authenticationworker/worker.go

worker/authenticationworker/worker_test.go

worker/provisioner/kvm-broker.go

worker/provisioner/kvm-broker_test.go

worker/uniter/export_test.go

worker/uniter/jujuc/owner-get.go

worker/uniter/jujuc/owner-get_test.go

worker/uniter/runlistener.go

worker/uniter/runlistener_test.go

files removed:
worker/deployer/addresser.go

files renamed:
environs/manual/agent.go => cloudinit/sshinit/configure.go

environs/manual/agent_test.go => cloudinit/sshinit/configure_test.go

environs/manual/detection.go => environs/manual/init.go

environs/manual/detection_test.go => environs/manual/init_test.go

provider/maas/environ_test.go => provider/maas/environ_whitebox_test.go

environs/manual/ssh.go => utils/ssh/ssh.go

files modified:
Makefile

agent/agent.go

agent/bootstrap.go

agent/bootstrap_test.go

charm/export_test.go

charm/repo.go

charm/repo_test.go

cloudinit/cloudinit_test.go

cloudinit/options.go

cmd/charmd/main.go

cmd/charmload/main.go

cmd/cmd.go

cmd/cmd_test.go

cmd/juju/addmachine.go

cmd/juju/addmachine_test.go

cmd/juju/addunit_test.go

cmd/juju/bootstrap.go

cmd/juju/bootstrap_test.go

cmd/juju/cmd_test.go

cmd/juju/constraints.go

cmd/juju/constraints_test.go

cmd/juju/debughooks.go

cmd/juju/debughooks_test.go

cmd/juju/debuglog.go

cmd/juju/deploy.go

cmd/juju/deploy_test.go

cmd/juju/destroyenvironment.go

cmd/juju/destroymachine.go

cmd/juju/destroymachine_test.go

cmd/juju/environment.go

cmd/juju/environment_test.go

cmd/juju/get_test.go

cmd/juju/helptool.go

cmd/juju/helptool_test.go

cmd/juju/main.go

cmd/juju/main_test.go

cmd/juju/scp.go

cmd/juju/scp_test.go

cmd/juju/set.go

cmd/juju/set_test.go

cmd/juju/ssh.go

cmd/juju/ssh_test.go

cmd/juju/status.go

cmd/juju/status_test.go

cmd/juju/unset.go

cmd/juju/unset_test.go

cmd/juju/upgradecharm.go

cmd/juju/upgradecharm_test.go

cmd/juju/upgradejuju.go

cmd/juju/upgradejuju_test.go

cmd/jujud/agent_test.go

cmd/jujud/bootstrap_test.go

cmd/jujud/machine.go

cmd/jujud/machine_test.go

cmd/jujud/main.go

cmd/jujud/unit_test.go

cmd/plugins/juju-metadata/imagemetadata.go

cmd/plugins/juju-metadata/signmetadata.go

cmd/plugins/juju-metadata/toolsmetadata.go

cmd/supercommand.go

container/interface.go

container/kvm/container.go

container/kvm/containerfactory.go

container/kvm/initialisation.go

container/kvm/instance.go

container/kvm/interface.go

container/kvm/kvm.go

container/kvm/kvm_test.go

container/kvm/mock/mock-kvm.go

container/kvm/mock/mock-kvm_test.go

container/lxc/instance.go

container/lxc/lxc.go

container/lxc/lxc_test.go

container/userdata.go

dependencies.tsv

environs/bootstrap/bootstrap.go

environs/bootstrap/bootstrap_test.go

environs/bootstrap/state.go

environs/bootstrap/state_test.go

environs/cloudinit.go

environs/cloudinit/cloudinit.go

environs/cloudinit/cloudinit_test.go

environs/cloudinit_test.go

environs/config.go

environs/config/authkeys.go

environs/config/config.go

environs/config/config_test.go

environs/config_test.go

environs/export_test.go

environs/filestorage/filestorage.go

environs/filestorage/filestorage_test.go

environs/imagemetadata/marshal.go

environs/imagemetadata/marshal_test.go

environs/interface.go

environs/jujutest/livetests.go

environs/jujutest/tests.go

environs/manual/bootstrap.go

environs/manual/bootstrap_test.go

environs/manual/fakessh.go

environs/manual/provisioner.go

environs/manual/provisioner_test.go

environs/open_test.go

environs/simplestreams/simplestreams.go

environs/sshstorage/storage.go

environs/sshstorage/storage_test.go

environs/sync/sync.go

environs/testing/tools.go

environs/tools/marshal.go

environs/tools/marshal_test.go

environs/tools/simplestreams.go

instance/instance.go

juju/api.go

juju/apiconn_test.go

juju/conn.go

juju/conn_test.go

juju/export_test.go

juju/testing/conn.go

juju/testing/repo.go

juju/testing/utils.go

log/log.go

log/syslog/config.go

log/syslog/config_test.go

names/environ.go

names/machine.go

provider/azure/customdata_test.go

provider/azure/environ.go

provider/azure/instance.go

provider/common/bootstrap.go

provider/common/bootstrap_test.go

provider/common/export_test.go

provider/dummy/environs.go

provider/ec2/ec2.go

provider/ec2/local_test.go

provider/joyent/environ.go

provider/joyent/instance.go

provider/local/config.go

provider/local/environ.go

provider/local/environprovider.go

provider/local/instance.go

provider/local/prereqs.go

provider/local/prereqs_test.go

provider/maas/config.go

provider/maas/environ.go

provider/maas/instance.go

provider/maas/instance_test.go

provider/maas/maas_test.go

provider/null/config.go

provider/null/config_test.go

provider/null/environ.go

provider/null/environ_test.go

provider/null/instance.go

provider/openstack/export_test.go

provider/openstack/local_test.go

provider/openstack/provider.go

rpc/client.go

rpc/reflect_test.go

rpc/rpc_test.go

rpc/rpcreflect/value.go

rpc/server.go

schema/schema.go

schema/schema_test.go

scripts/checktesting.bash

scripts/win-installer/setup.iss

state/addmachine.go

state/address.go

state/api/agent/unit_test.go

state/api/apiclient.go

state/api/client.go

state/api/client_test.go

state/api/deployer/deployer.go

state/api/deployer/deployer_test.go

state/api/params/apierror.go

state/api/params/internal.go

state/api/params/params.go

state/api/params/params_test.go

state/api/provisioner/machine.go

state/api/provisioner/provisioner_test.go

state/api/state.go

state/api/uniter/service.go

state/api/uniter/service_test.go

state/api/uniter/uniter_test.go

state/api/watcher/watcher_test.go

state/apiserver/admin.go

state/apiserver/agent/agent_test.go

state/apiserver/apiserver.go

state/apiserver/client/api_test.go

state/apiserver/client/client.go

state/apiserver/client/client_test.go

state/apiserver/client/get.go

state/apiserver/client/get_test.go

state/apiserver/client/perm_test.go

state/apiserver/common/interfaces.go

state/apiserver/deployer/deployer.go

state/apiserver/deployer/deployer_test.go

state/apiserver/export_test.go

state/apiserver/login_test.go

state/apiserver/machine/common_test.go

state/apiserver/provisioner/provisioner.go

state/apiserver/provisioner/provisioner_test.go

state/apiserver/root.go

state/apiserver/root_test.go

state/apiserver/server_test.go

state/apiserver/testing/errors.go

state/apiserver/testing/fakeauthorizer.go

state/apiserver/uniter/uniter.go

state/apiserver/uniter/uniter_test.go

state/apiserver/upgrader/upgrader_test.go

state/assign_test.go

state/bench_test.go

state/charm.go

state/charm_test.go

state/cleanup.go

state/cleanup_test.go

state/conn_test.go

state/container.go

state/environ.go

state/environ_test.go

state/export_test.go

state/initialize_test.go

state/interface.go

state/life_test.go

state/machine.go

state/machine_test.go

state/megawatcher.go

state/megawatcher_internal_test.go

state/minimumunits_test.go

state/relation_test.go

state/relationunit_test.go

state/service.go

state/service_test.go

state/settings_test.go

state/state.go

state/state_test.go

state/testing/config.go

state/tools_test.go

state/unit.go

state/unit_test.go

state/user.go

state/user_test.go

state/watcher.go

store/store.go

store/store_test.go

testing/charm.go

testing/checkers/bool.go

testing/checkers/bool_test.go

testing/environ.go

testing/mgo.go

testing/mgo_test.go

testing/testbase/log.go

utils/apt.go

utils/apt_test.go

utils/file.go

utils/file_test.go

version/version.go

worker/cleaner/cleaner_test.go

worker/deployer/deployer_test.go

worker/deployer/export_test.go

worker/deployer/simple.go

worker/deployer/simple_test.go

worker/firewaller/firewaller_test.go

worker/minunitsworker/minunitsworker_test.go

worker/provisioner/container_initialisation.go

worker/provisioner/container_initialisation_test.go

worker/provisioner/export_test.go

worker/provisioner/lxc-broker.go

worker/provisioner/lxc-broker_test.go

worker/provisioner/provisioner.go

worker/provisioner/provisioner_task.go

worker/provisioner/provisioner_test.go

worker/uniter/charm/charm_test.go

worker/uniter/context.go

worker/uniter/context_test.go

worker/uniter/filter_test.go

worker/uniter/jujuc/context.go

worker/uniter/jujuc/server.go

worker/uniter/jujuc/server_test.go

worker/uniter/jujuc/util_test.go

worker/uniter/relationer_test.go

worker/uniter/uniter.go

worker/uniter/uniter_test.go

Show diffs side-by-side

added added

removed removed

provider/joyent/environ.go

92

92

return environs.EmptyStorage

93

93

}

94

94

95

func (env *joyentEnviron) Bootstrap(cons constraints.Value) error {

96

return common.Bootstrap(env, cons)

95

func (env *joyentEnviron) Bootstrap(ctx environs.BootstrapContext, cons constraints.Value) error {

96

return common.Bootstrap(ctx, env, cons)

97

97

}

98

98

99

99

func (env *joyentEnviron) StateInfo() (*state.Info, *api.Info, error) {

Older »