{"action":"created","comment":{"url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/comments/33451223","id":33451223,"diff_hunk":"@@ -6,56 +6,29 @@ These instructions cover commissioning a Chef client node on an EC2 server as pa\n \n * An Amazon EC2 account.\n * A DNS root domain configured with Route53 (Amazon's built-in DNS service, accessible from the EC2 console. This domain will be referred to as `<zone>` in this document.\n-* You must have [installed a Chef server](Installing_a_Chef_server.md) and thus know the `<webUIPass>` for your server.\n+* You must have [installed a Chef server](Installing_a_Chef_server.md) and thus know the `<chef-user-name>` and `<chef-user-password>` for your server.\n * A web-browser with which you can visit the Chef server Web UI.\n \n ## Create the instance\n \n-Create a `m1.small` AWS EC2 instance running `Ubuntu Server 12.04.1 LTS` using the AWS web interface.  Configure its security group to allow access on port 22 (for SSH). The SSH keypair you provide here is referred to below as `<amazon_ssh_key>`. It is easiest if you use the same SSH keypair for all of your instances.\n+Create a `t2.micro` AWS EC2 instance running `Ubuntu Server 14.04.2 LTS` using the AWS web interface.  Configure its security group to allow access on port 22 (for SSH). The SSH keypair you provide here is referred to below as `<amazon_ssh_key>`. It is easiest if you use the same SSH keypair for all of your instances.\n \n-Configure a DNS entry for this machine, `chef-client.<zone>`. (The precise name isn't important, but we use this consistently in the documentation that follows.) It should have a non-aliased A record pointing at the public IP address of the instance as displayed in the EC2 console.\n+Configure a DNS entry for this machine, `chef workstation.<zone>`. (The precise name isn't important, but we use this consistently in the documentation that follows.) It should have a non-aliased A record pointing at the public IP address of the instance as displayed in the EC2 console.\n \n Once the instance is up and running and you can connect to it over SSH, you may continue to the next steps.\n \n If you make a mistake, simply delete the instance permanently by selecting \"Terminate\" in the EC2 console, and start again. The terminated instance may take a few minutes to disappear from the console.\n \n-## Prepare APT\n-\n-Connect to `chef-client.<zone>` as the `ubuntu` user over SSH.\n-\n-Install the `add-apt-key` tool.\n-\n-    sudo apt-get install add-apt-key -y\n-\n-Under sudo, create `/etc/apt/sources.list.d/opscode.list` with the following content:\n-\n-    deb http://apt.opscode.com/ precise-0.10 main\n-\n-Install the GPG key for this repository:\n-\n-    sudo add-apt-key 83EF826A\n-\n-Install the Chef keyring and update APT's indexes.\n-\n-    sudo apt-get update\n-    sudo apt-get install opscode-keyring -y\n-    sudo apt-get upgrade -y\n-\n-Once this is done, you can continue on to install the Chef client software.\n-\n-## Install the Chef client software\n+## Install Ruby 1.9.3\n \n-Install the Chef client tool.\n+The Clearwater chef plugins use features from Ruby 1.9.3.  To start run the following command.\n \n-    sudo apt-get install chef -y\n+    curl -L https://get.rvm.io | bash -s stable\n \n-During the install you will be prompted for the Chef server URL, enter `http://chef-server.<zone>:4000`.\n+This may fail due to missing GPG signiatures. If this happens it will suggest a command to run to resolve the problem (e.g. gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3`). Run the command suggested, then run the above command again, which should now succeed).\n \n-## Install Ruby 1.9.3\n+Next install the required ruby version.","path":"docs/Installing_a_Chef_workstation.md","position":57,"original_position":57,"commit_id":"e2be2a847bcef0daaa144df7ddefa1ad0e465dcd","original_commit_id":"e2be2a847bcef0daaa144df7ddefa1ad0e465dcd","user":{"login":"AlexHockey","id":4903205,"avatar_url":"https://avatars.githubusercontent.com/u/4903205?v=3","gravatar_id":"","url":"https://api.github.com/users/AlexHockey","html_url":"https://github.com/AlexHockey","followers_url":"https://api.github.com/users/AlexHockey/followers","following_url":"https://api.github.com/users/AlexHockey/following{/other_user}","gists_url":"https://api.github.com/users/AlexHockey/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexHockey/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexHockey/subscriptions","organizations_url":"https://api.github.com/users/AlexHockey/orgs","repos_url":"https://api.github.com/users/AlexHockey/repos","events_url":"https://api.github.com/users/AlexHockey/events{/privacy}","received_events_url":"https://api.github.com/users/AlexHockey/received_events","type":"User","site_admin":false},"body":"@bossmc, do you have an opinion on this?","created_at":"2015-06-29T10:28:10Z","updated_at":"2015-06-29T10:28:10Z","html_url":"https://github.com/Metaswitch/clearwater-readthedocs/pull/74#discussion_r33451223","pull_request_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/74","_links":{"self":{"href":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/comments/33451223"},"html":{"href":"https://github.com/Metaswitch/clearwater-readthedocs/pull/74#discussion_r33451223"},"pull_request":{"href":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/74"}}},"pull_request":{"url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/74","id":38677926,"html_url":"https://github.com/Metaswitch/clearwater-readthedocs/pull/74","diff_url":"https://github.com/Metaswitch/clearwater-readthedocs/pull/74.diff","patch_url":"https://github.com/Metaswitch/clearwater-readthedocs/pull/74.patch","issue_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/issues/74","number":74,"state":"open","locked":false,"title":"[Reviewer: Rob] Update docs to reflect that latest version of chef","user":{"login":"AlexHockey","id":4903205,"avatar_url":"https://avatars.githubusercontent.com/u/4903205?v=3","gravatar_id":"","url":"https://api.github.com/users/AlexHockey","html_url":"https://github.com/AlexHockey","followers_url":"https://api.github.com/users/AlexHockey/followers","following_url":"https://api.github.com/users/AlexHockey/following{/other_user}","gists_url":"https://api.github.com/users/AlexHockey/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexHockey/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexHockey/subscriptions","organizations_url":"https://api.github.com/users/AlexHockey/orgs","repos_url":"https://api.github.com/users/AlexHockey/repos","events_url":"https://api.github.com/users/AlexHockey/events{/privacy}","received_events_url":"https://api.github.com/users/AlexHockey/received_events","type":"User","site_admin":false},"body":"Rob, please can you review this PR to update our docs to reflect how you install and use the latest chef. The main changes are:\r\n\r\n* The process for installing the server is completely different.\r\n* I have removed some unnecessary stuff from the chef client install. \r\n* I have changed the docs so that \"chef client\" refers to nodes and \"chef workstation\" refers to developer machines that run knife. This reflects the current chef documentation (e.g. https://docs.chef.io/workstation.html). \r\n\r\nTested by running `mkdocs serve`. No errors reported and all modified pages looked fine. ","created_at":"2015-06-26T18:45:27Z","updated_at":"2015-06-29T10:28:10Z","closed_at":null,"merged_at":null,"merge_commit_sha":"cc3d6fa0f5005a66c3585eaa16a5bd13d027c218","assignee":{"login":"AlexHockey","id":4903205,"avatar_url":"https://avatars.githubusercontent.com/u/4903205?v=3","gravatar_id":"","url":"https://api.github.com/users/AlexHockey","html_url":"https://github.com/AlexHockey","followers_url":"https://api.github.com/users/AlexHockey/followers","following_url":"https://api.github.com/users/AlexHockey/following{/other_user}","gists_url":"https://api.github.com/users/AlexHockey/gists{/gist_id}","starred_url":"https://api.github.com/users/AlexHockey/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AlexHockey/subscriptions","organizations_url":"https://api.github.com/users/AlexHockey/orgs","repos_url":"https://api.github.com/users/AlexHockey/repos","events_url":"https://api.github.com/users/AlexHockey/events{/privacy}","received_events_url":"https://api.github.com/users/AlexHockey/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/74/commits","review_comments_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/74/comments","review_comment_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/issues/74/comments","statuses_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/statuses/e2be2a847bcef0daaa144df7ddefa1ad0e465dcd","head":{"label":"Metaswitch:latest_chef","ref":"latest_chef","sha":"e2be2a847bcef0daaa144df7ddefa1ad0e465dcd","user":{"login":"Metaswitch","id":453759,"avatar_url":"https://avatars.githubusercontent.com/u/453759?v=3","gravatar_id":"","url":"https://api.github.com/users/Metaswitch","html_url":"https://github.com/Metaswitch","followers_url":"https://api.github.com/users/Metaswitch/followers","following_url":"https://api.github.com/users/Metaswitch/following{/other_user}","gists_url":"https://api.github.com/users/Metaswitch/gists{/gist_id}","starred_url":"https://api.github.com/users/Metaswitch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Metaswitch/subscriptions","organizations_url":"https://api.github.com/users/Metaswitch/orgs","repos_url":"https://api.github.com/users/Metaswitch/repos","events_url":"https://api.github.com/users/Metaswitch/events{/privacy}","received_events_url":"https://api.github.com/users/Metaswitch/received_events","type":"Organization","site_admin":false},"repo":{"id":30247023,"name":"clearwater-readthedocs","full_name":"Metaswitch/clearwater-readthedocs","owner":{"login":"Metaswitch","id":453759,"avatar_url":"https://avatars.githubusercontent.com/u/453759?v=3","gravatar_id":"","url":"https://api.github.com/users/Metaswitch","html_url":"https://github.com/Metaswitch","followers_url":"https://api.github.com/users/Metaswitch/followers","following_url":"https://api.github.com/users/Metaswitch/following{/other_user}","gists_url":"https://api.github.com/users/Metaswitch/gists{/gist_id}","starred_url":"https://api.github.com/users/Metaswitch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Metaswitch/subscriptions","organizations_url":"https://api.github.com/users/Metaswitch/orgs","repos_url":"https://api.github.com/users/Metaswitch/repos","events_url":"https://api.github.com/users/Metaswitch/events{/privacy}","received_events_url":"https://api.github.com/users/Metaswitch/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Metaswitch/clearwater-readthedocs","description":"Source repository for Clearwater's ReadTheDocs.org documentation","fork":false,"url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs","forks_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/forks","keys_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/teams","hooks_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/hooks","issue_events_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/issues/events{/number}","events_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/events","assignees_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/assignees{/user}","branches_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/branches{/branch}","tags_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/tags","blobs_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/git/refs{/sha}","trees_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/statuses/{sha}","languages_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/languages","stargazers_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/stargazers","contributors_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/contributors","subscribers_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/subscribers","subscription_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/subscription","commits_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/commits{/sha}","git_commits_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/git/commits{/sha}","comments_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/comments{/number}","issue_comment_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/issues/comments{/number}","contents_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/contents/{+path}","compare_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/merges","archive_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/downloads","issues_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/issues{/number}","pulls_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls{/number}","milestones_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/milestones{/number}","notifications_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/labels{/name}","releases_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/releases{/id}","created_at":"2015-02-03T14:37:16Z","updated_at":"2015-05-02T12:17:09Z","pushed_at":"2015-06-26T18:45:28Z","git_url":"git://github.com/Metaswitch/clearwater-readthedocs.git","ssh_url":"git@github.com:Metaswitch/clearwater-readthedocs.git","clone_url":"https://github.com/Metaswitch/clearwater-readthedocs.git","svn_url":"https://github.com/Metaswitch/clearwater-readthedocs","homepage":null,"size":1515,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":3,"mirror_url":null,"open_issues_count":3,"forks":3,"open_issues":3,"watchers":0,"default_branch":"master"}},"base":{"label":"Metaswitch:master","ref":"master","sha":"f741540e48160ce896196eab1a5ff5a41924b54f","user":{"login":"Metaswitch","id":453759,"avatar_url":"https://avatars.githubusercontent.com/u/453759?v=3","gravatar_id":"","url":"https://api.github.com/users/Metaswitch","html_url":"https://github.com/Metaswitch","followers_url":"https://api.github.com/users/Metaswitch/followers","following_url":"https://api.github.com/users/Metaswitch/following{/other_user}","gists_url":"https://api.github.com/users/Metaswitch/gists{/gist_id}","starred_url":"https://api.github.com/users/Metaswitch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Metaswitch/subscriptions","organizations_url":"https://api.github.com/users/Metaswitch/orgs","repos_url":"https://api.github.com/users/Metaswitch/repos","events_url":"https://api.github.com/users/Metaswitch/events{/privacy}","received_events_url":"https://api.github.com/users/Metaswitch/received_events","type":"Organization","site_admin":false},"repo":{"id":30247023,"name":"clearwater-readthedocs","full_name":"Metaswitch/clearwater-readthedocs","owner":{"login":"Metaswitch","id":453759,"avatar_url":"https://avatars.githubusercontent.com/u/453759?v=3","gravatar_id":"","url":"https://api.github.com/users/Metaswitch","html_url":"https://github.com/Metaswitch","followers_url":"https://api.github.com/users/Metaswitch/followers","following_url":"https://api.github.com/users/Metaswitch/following{/other_user}","gists_url":"https://api.github.com/users/Metaswitch/gists{/gist_id}","starred_url":"https://api.github.com/users/Metaswitch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Metaswitch/subscriptions","organizations_url":"https://api.github.com/users/Metaswitch/orgs","repos_url":"https://api.github.com/users/Metaswitch/repos","events_url":"https://api.github.com/users/Metaswitch/events{/privacy}","received_events_url":"https://api.github.com/users/Metaswitch/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Metaswitch/clearwater-readthedocs","description":"Source repository for Clearwater's ReadTheDocs.org documentation","fork":false,"url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs","forks_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/forks","keys_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/teams","hooks_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/hooks","issue_events_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/issues/events{/number}","events_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/events","assignees_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/assignees{/user}","branches_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/branches{/branch}","tags_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/tags","blobs_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/git/refs{/sha}","trees_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/statuses/{sha}","languages_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/languages","stargazers_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/stargazers","contributors_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/contributors","subscribers_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/subscribers","subscription_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/subscription","commits_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/commits{/sha}","git_commits_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/git/commits{/sha}","comments_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/comments{/number}","issue_comment_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/issues/comments{/number}","contents_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/contents/{+path}","compare_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/merges","archive_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/downloads","issues_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/issues{/number}","pulls_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls{/number}","milestones_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/milestones{/number}","notifications_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/labels{/name}","releases_url":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/releases{/id}","created_at":"2015-02-03T14:37:16Z","updated_at":"2015-05-02T12:17:09Z","pushed_at":"2015-06-26T18:45:28Z","git_url":"git://github.com/Metaswitch/clearwater-readthedocs.git","ssh_url":"git@github.com:Metaswitch/clearwater-readthedocs.git","clone_url":"https://github.com/Metaswitch/clearwater-readthedocs.git","svn_url":"https://github.com/Metaswitch/clearwater-readthedocs","homepage":null,"size":1515,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":3,"mirror_url":null,"open_issues_count":3,"forks":3,"open_issues":3,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/74"},"html":{"href":"https://github.com/Metaswitch/clearwater-readthedocs/pull/74"},"issue":{"href":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/issues/74"},"comments":{"href":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/issues/74/comments"},"review_comments":{"href":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/74/comments"},"review_comment":{"href":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/pulls/74/commits"},"statuses":{"href":"https://api.github.com/repos/Metaswitch/clearwater-readthedocs/statuses/e2be2a847bcef0daaa144df7ddefa1ad0e465dcd"}}}}