GitHub PullRequestReviewCommentEvent at 2014-07-25 05:35:09
Repository: juju
Actor: axw
Payload: {"action":"created","comment":{"url":"https://api.github.com/repos/juju/juju/pulls/comments/15386902","id":15386902,"diff_hunk":"@@ -86,11 +92,12 @@ func ProvisionMachine(args ProvisionMachineArgs) (machineId string, err error) {\n \t}()\n \n \t// Create the \"ubuntu\" user and initialise passwordless sudo. We populate\n-\t// the ubuntu user's authorized_keys file with the public keys in the current\n-\t// user's ~/.ssh directory. The authenticationworker will later update the\n-\t// ubuntu user's authorized_keys.\n+\t// the ubuntu user's authorized_keys file with the public keys in the\n+\t// current user's ~/.ssh directory and/or the key passed in with args.Key.\n+\t// The authenticationworker will later update the ubuntu user's\n+\t// authorized_keys.\n \tuser, hostname := splitUserHost(args.Host)\n-\tauthorizedKeys, err := config.ReadAuthorizedKeys(\"\")\n+\tauthorizedKeys, err := config.ReadAuthorizedKeys(args.SSHKeyPath)\n \tif err := InitUbuntuUser(hostname, user, authorizedKeys, args.Stdin, args.Stdout); err != nil {","path":"environs/manual/provisioner.go","position":27,"original_position":27,"commit_id":"dbfedc4f22f979384e687f967e948c95d91af0b9","original_commit_id":"dbfedc4f22f979384e687f967e948c95d91af0b9","user":{"login":"axw","id":843579,"avatar_url":"https://avatars.githubusercontent.com/u/843579?","gravatar_id":"3e47ab60c72fc978e7bcfaf7b22f479b","url":"https://api.github.com/users/axw","html_url":"https://github.com/axw","followers_url":"https://api.github.com/users/axw/followers","following_url":"https://api.github.com/users/axw/following{/other_user}","gists_url":"https://api.github.com/users/axw/gists{/gist_id}","starred_url":"https://api.github.com/users/axw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/axw/subscriptions","organizations_url":"https://api.github.com/users/axw/orgs","repos_url":"https://api.github.com/users/axw/repos","events_url":"https://api.github.com/users/axw/events{/privacy}","received_events_url":"https://api.github.com/users/axw/received_events","type":"User","site_admin":false},"body":"Pass the key path to InitUbuntuUser. Set it in options used in there. That's the *only* thing that needs to change outside of the cmd/juju code.","created_at":"2014-07-25T05:35:09Z","updated_at":"2014-07-25T05:35:09Z","html_url":"https://github.com/juju/juju/pull/289#discussion_r15386902","pull_request_url":"https://api.github.com/repos/juju/juju/pulls/289","_links":{"self":{"href":"https://api.github.com/repos/juju/juju/pulls/comments/15386902"},"html":{"href":"https://github.com/juju/juju/pull/289#discussion_r15386902"},"pull_request":{"href":"https://api.github.com/repos/juju/juju/pulls/289"}}},"pull_request":{"url":"https://api.github.com/repos/juju/juju/pulls/289","id":18251569,"html_url":"https://github.com/juju/juju/pull/289","diff_url":"https://github.com/juju/juju/pull/289.diff","patch_url":"https://github.com/juju/juju/pull/289.patch","issue_url":"https://api.github.com/repos/juju/juju/issues/289","number":289,"state":"open","title":"Fixes lp:1339976, lp:1270466 - manual provision, specific key + cloudint use ssh client","user":{"login":"waigani","id":33275,"avatar_url":"https://avatars.githubusercontent.com/u/33275?","gravatar_id":"40eb9f01a3481f86a4b479ed873a7cd0","url":"https://api.github.com/users/waigani","html_url":"https://github.com/waigani","followers_url":"https://api.github.com/users/waigani/followers","following_url":"https://api.github.com/users/waigani/following{/other_user}","gists_url":"https://api.github.com/users/waigani/gists{/gist_id}","starred_url":"https://api.github.com/users/waigani/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/waigani/subscriptions","organizations_url":"https://api.github.com/users/waigani/orgs","repos_url":"https://api.github.com/users/waigani/repos","events_url":"https://api.github.com/users/waigani/events{/privacy}","received_events_url":"https://api.github.com/users/waigani/received_events","type":"User","site_admin":false},"body":"### Fix [lp:1270466](https://bugs.launchpad.net/juju-core/+bug/1270466)\r\nAdd the following cmd to add-machine:\r\n\r\n```shell\r\njuju add-machine ssh:user@10.10.0.3 -i ~/myid.pub\r\n```\r\n\r\nwhere -i is a specific identity key used to ssh into the machine. The key is also stored in the machine for future logins.\r\n\r\n#### Tests\r\n\r\nThe custom key is passed to config.ReadAuthorizedKeys within ProvisionMachine. AuthKeysSuite already tests ReadAuthorizedKeys for passing in and reading specific keys and provisionerSuite already covers ProvisionMachine. As such, no extra tests have been added.\r\n\r\nTests for parsing the new parameters on the command have been added. \r\n\r\n### Fix [lp:1339976](https://bugs.launchpad.net/juju-core/+bug/1339976)\r\nThis PR also fixes a bug where cloudinit was not using the ssh client: cloudinit/sshinit/configure.go:63","created_at":"2014-07-10T22:50:13Z","updated_at":"2014-07-25T05:35:09Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e2f3af6f0c902421a0136c08aa4307b78076990f","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/juju/juju/pulls/289/commits","review_comments_url":"https://api.github.com/repos/juju/juju/pulls/289/comments","review_comment_url":"https://api.github.com/repos/juju/juju/pulls/comments/{number}","comments_url":"https://api.github.com/repos/juju/juju/issues/289/comments","statuses_url":"https://api.github.com/repos/juju/juju/statuses/dbfedc4f22f979384e687f967e948c95d91af0b9","head":{"label":"waigani:manual-prov-key","ref":"manual-prov-key","sha":"dbfedc4f22f979384e687f967e948c95d91af0b9","user":{"login":"waigani","id":33275,"avatar_url":"https://avatars.githubusercontent.com/u/33275?","gravatar_id":"40eb9f01a3481f86a4b479ed873a7cd0","url":"https://api.github.com/users/waigani","html_url":"https://github.com/waigani","followers_url":"https://api.github.com/users/waigani/followers","following_url":"https://api.github.com/users/waigani/following{/other_user}","gists_url":"https://api.github.com/users/waigani/gists{/gist_id}","starred_url":"https://api.github.com/users/waigani/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/waigani/subscriptions","organizations_url":"https://api.github.com/users/waigani/orgs","repos_url":"https://api.github.com/users/waigani/repos","events_url":"https://api.github.com/users/waigani/events{/privacy}","received_events_url":"https://api.github.com/users/waigani/received_events","type":"User","site_admin":false},"repo":{"id":20465970,"name":"juju","full_name":"waigani/juju","owner":{"login":"waigani","id":33275,"avatar_url":"https://avatars.githubusercontent.com/u/33275?","gravatar_id":"40eb9f01a3481f86a4b479ed873a7cd0","url":"https://api.github.com/users/waigani","html_url":"https://github.com/waigani","followers_url":"https://api.github.com/users/waigani/followers","following_url":"https://api.github.com/users/waigani/following{/other_user}","gists_url":"https://api.github.com/users/waigani/gists{/gist_id}","starred_url":"https://api.github.com/users/waigani/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/waigani/subscriptions","organizations_url":"https://api.github.com/users/waigani/orgs","repos_url":"https://api.github.com/users/waigani/repos","events_url":"https://api.github.com/users/waigani/events{/privacy}","received_events_url":"https://api.github.com/users/waigani/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/waigani/juju","description":"juju is devops distilled","fork":true,"url":"https://api.github.com/repos/waigani/juju","forks_url":"https://api.github.com/repos/waigani/juju/forks","keys_url":"https://api.github.com/repos/waigani/juju/keys{/key_id}","collaborators_url":"https://api.github.com/repos/waigani/juju/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/waigani/juju/teams","hooks_url":"https://api.github.com/repos/waigani/juju/hooks","issue_events_url":"https://api.github.com/repos/waigani/juju/issues/events{/number}","events_url":"https://api.github.com/repos/waigani/juju/events","assignees_url":"https://api.github.com/repos/waigani/juju/assignees{/user}","branches_url":"https://api.github.com/repos/waigani/juju/branches{/branch}","tags_url":"https://api.github.com/repos/waigani/juju/tags","blobs_url":"https://api.github.com/repos/waigani/juju/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/waigani/juju/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/waigani/juju/git/refs{/sha}","trees_url":"https://api.github.com/repos/waigani/juju/git/trees{/sha}","statuses_url":"https://api.github.com/repos/waigani/juju/statuses/{sha}","languages_url":"https://api.github.com/repos/waigani/juju/languages","stargazers_url":"https://api.github.com/repos/waigani/juju/stargazers","contributors_url":"https://api.github.com/repos/waigani/juju/contributors","subscribers_url":"https://api.github.com/repos/waigani/juju/subscribers","subscription_url":"https://api.github.com/repos/waigani/juju/subscription","commits_url":"https://api.github.com/repos/waigani/juju/commits{/sha}","git_commits_url":"https://api.github.com/repos/waigani/juju/git/commits{/sha}","comments_url":"https://api.github.com/repos/waigani/juju/comments{/number}","issue_comment_url":"https://api.github.com/repos/waigani/juju/issues/comments/{number}","contents_url":"https://api.github.com/repos/waigani/juju/contents/{+path}","compare_url":"https://api.github.com/repos/waigani/juju/compare/{base}...{head}","merges_url":"https://api.github.com/repos/waigani/juju/merges","archive_url":"https://api.github.com/repos/waigani/juju/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/waigani/juju/downloads","issues_url":"https://api.github.com/repos/waigani/juju/issues{/number}","pulls_url":"https://api.github.com/repos/waigani/juju/pulls{/number}","milestones_url":"https://api.github.com/repos/waigani/juju/milestones{/number}","notifications_url":"https://api.github.com/repos/waigani/juju/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/waigani/juju/labels{/name}","releases_url":"https://api.github.com/repos/waigani/juju/releases{/id}","created_at":"2014-06-04T01:27:31Z","updated_at":"2014-06-26T02:26:11Z","pushed_at":"2014-07-25T05:09:29Z","git_url":"git://github.com/waigani/juju.git","ssh_url":"git@github.com:waigani/juju.git","clone_url":"https://github.com/waigani/juju.git","svn_url":"https://github.com/waigani/juju","homepage":null,"size":26340,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_downloads":true,"has_wiki":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"juju:master","ref":"master","sha":"7c98f38891eb98e6f1a8b01a46e3a9700eb51003","user":{"login":"juju","id":4604548,"avatar_url":"https://avatars.githubusercontent.com/u/4604548?","gravatar_id":"b095d1e26e5705abe0ad2de7d87aac2e","url":"https://api.github.com/users/juju","html_url":"https://github.com/juju","followers_url":"https://api.github.com/users/juju/followers","following_url":"https://api.github.com/users/juju/following{/other_user}","gists_url":"https://api.github.com/users/juju/gists{/gist_id}","starred_url":"https://api.github.com/users/juju/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/juju/subscriptions","organizations_url":"https://api.github.com/users/juju/orgs","repos_url":"https://api.github.com/users/juju/repos","events_url":"https://api.github.com/users/juju/events{/privacy}","received_events_url":"https://api.github.com/users/juju/received_events","type":"Organization","site_admin":false},"repo":{"id":20445947,"name":"juju","full_name":"juju/juju","owner":{"login":"juju","id":4604548,"avatar_url":"https://avatars.githubusercontent.com/u/4604548?","gravatar_id":"b095d1e26e5705abe0ad2de7d87aac2e","url":"https://api.github.com/users/juju","html_url":"https://github.com/juju","followers_url":"https://api.github.com/users/juju/followers","following_url":"https://api.github.com/users/juju/following{/other_user}","gists_url":"https://api.github.com/users/juju/gists{/gist_id}","starred_url":"https://api.github.com/users/juju/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/juju/subscriptions","organizations_url":"https://api.github.com/users/juju/orgs","repos_url":"https://api.github.com/users/juju/repos","events_url":"https://api.github.com/users/juju/events{/privacy}","received_events_url":"https://api.github.com/users/juju/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/juju/juju","description":"juju is devops distilled","fork":false,"url":"https://api.github.com/repos/juju/juju","forks_url":"https://api.github.com/repos/juju/juju/forks","keys_url":"https://api.github.com/repos/juju/juju/keys{/key_id}","collaborators_url":"https://api.github.com/repos/juju/juju/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/juju/juju/teams","hooks_url":"https://api.github.com/repos/juju/juju/hooks","issue_events_url":"https://api.github.com/repos/juju/juju/issues/events{/number}","events_url":"https://api.github.com/repos/juju/juju/events","assignees_url":"https://api.github.com/repos/juju/juju/assignees{/user}","branches_url":"https://api.github.com/repos/juju/juju/branches{/branch}","tags_url":"https://api.github.com/repos/juju/juju/tags","blobs_url":"https://api.github.com/repos/juju/juju/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/juju/juju/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/juju/juju/git/refs{/sha}","trees_url":"https://api.github.com/repos/juju/juju/git/trees{/sha}","statuses_url":"https://api.github.com/repos/juju/juju/statuses/{sha}","languages_url":"https://api.github.com/repos/juju/juju/languages","stargazers_url":"https://api.github.com/repos/juju/juju/stargazers","contributors_url":"https://api.github.com/repos/juju/juju/contributors","subscribers_url":"https://api.github.com/repos/juju/juju/subscribers","subscription_url":"https://api.github.com/repos/juju/juju/subscription","commits_url":"https://api.github.com/repos/juju/juju/commits{/sha}","git_commits_url":"https://api.github.com/repos/juju/juju/git/commits{/sha}","comments_url":"https://api.github.com/repos/juju/juju/comments{/number}","issue_comment_url":"https://api.github.com/repos/juju/juju/issues/comments/{number}","contents_url":"https://api.github.com/repos/juju/juju/contents/{+path}","compare_url":"https://api.github.com/repos/juju/juju/compare/{base}...{head}","merges_url":"https://api.github.com/repos/juju/juju/merges","archive_url":"https://api.github.com/repos/juju/juju/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/juju/juju/downloads","issues_url":"https://api.github.com/repos/juju/juju/issues{/number}","pulls_url":"https://api.github.com/repos/juju/juju/pulls{/number}","milestones_url":"https://api.github.com/repos/juju/juju/milestones{/number}","notifications_url":"https://api.github.com/repos/juju/juju/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/juju/juju/labels{/name}","releases_url":"https://api.github.com/repos/juju/juju/releases{/id}","created_at":"2014-06-03T14:28:10Z","updated_at":"2014-07-20T17:20:40Z","pushed_at":"2014-07-25T05:25:12Z","git_url":"git://github.com/juju/juju.git","ssh_url":"git@github.com:juju/juju.git","clone_url":"https://github.com/juju/juju.git","svn_url":"https://github.com/juju/juju","homepage":"juju.ubuntu.com","size":35008,"stargazers_count":183,"watchers_count":183,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":45,"mirror_url":null,"open_issues_count":41,"forks":45,"open_issues":41,"watchers":183,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/juju/juju/pulls/289"},"html":{"href":"https://github.com/juju/juju/pull/289"},"issue":{"href":"https://api.github.com/repos/juju/juju/issues/289"},"comments":{"href":"https://api.github.com/repos/juju/juju/issues/289/comments"},"review_comments":{"href":"https://api.github.com/repos/juju/juju/pulls/289/comments"},"review_comment":{"href":"https://api.github.com/repos/juju/juju/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/juju/juju/pulls/289/commits"},"statuses":{"href":"https://api.github.com/repos/juju/juju/statuses/dbfedc4f22f979384e687f967e948c95d91af0b9"}}}}