...
Make changes, deploy to test, and test them
Make changes in your local repository, commit the changes, perform a git pull, resolve conflicts and perform a git push. When changes are pushed you can run r10k to deploy these changes to your puppet environment. Then test that puppet runs fine, and that your changes are what you expect.
Merge changes into master
...
When you are happy about your changes in your branch, and you would like to merge the changes into the master branch the recommended procedure is:
- Create a pullrequest in the github GUI where your changes are described. Add Eigil Obrestad and Lars Erik Pedersen to the list over reviewers.
- Wait for the pullrequest to be merged into master, and a tag to be created.
- Make the r10k repo start following the new tag instead of the branch in role/profile repos.
- Test that the new r10k config works
- Merge the stable r10k config to r10k master.
Deploy new release to production
networking.yaml :
...
Whenever there are an upgrade window in the production environment, the procedure is simple.
- Merge the master branch of r10k to the production branch
- Deploy with r10k.
- Wait for puppet, or run it manually
- Enjoy your newly updated openstack installation.