From ac0f1b0cdc7f0a6dff8e2922f12e6af6f1dc986c Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Thu, 22 Oct 2015 15:43:36 -0700 Subject: [PATCH] Multiple fixes to the README fix step 16 and 17 being out of order fix a step that referred erronously to step 4 change the numbering to be reflective of actual numbering --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 333d136..70383ab 100644 --- a/README.md +++ b/README.md @@ -53,37 +53,37 @@ http://docs.puppetlabs.com/pe/latest/regenerate_certs_master.html 7. Add your user to the `puppet` group as well -7. Create a project called `control-repo` and set the Namespace to be the `puppet` group +8. Create a project called `control-repo` and set the Namespace to be the `puppet` group -8. Logout of root and login as the `r10k_api_user` +9. Logout of root and login as the `r10k_api_user` - Go to profile settings -> account ( https:///profile/account ) - Copy the api token -9. Clone this control repository to your laptop/workstation +10. Clone this control repository to your laptop/workstation - `git clone https://github.com/npwalker/control-repo.git` - `cd control-repo` -10. `git mv hieradata/nodes/example-puppet-master.yaml hieradata/nodes/.yaml` +11. `git mv hieradata/nodes/example-puppet-master.yaml hieradata/nodes/.yaml` - Open `hieradata/nodes/.yaml` - edit `gms_api_token` to be your api token - edit `git_management_system` to be 'gitlab' - edit the `gms_server_url` -11. `git add hieradata/nodes/.yaml` +12. `git add hieradata/nodes/.yaml` -11. `git commit -m "renaming example-puppet-master.yaml"` +13. `git commit -m "renaming example-puppet-master.yaml"` -11. Rename my repository as the upstream remote +14. Rename my repository as the upstream remote - `git remote rename origin upstream` -12. Add your internal repository as the origin remote - - `git remote add origin ` +15. Add your internal repository as the origin remote + - `git remote add origin ` -13. `git branch --set-upstream-to origin/production` - -13. Push the production branch of the repository from your machine up to your git server +16. Push the production branch of the repository from your machine up to your git server - `git push origin production` +17. `git branch --set-upstream-to origin/production` + ###Stash Coming soon!