Commit 1051fc87 authored by Walter Heck's avatar Walter Heck

Mostly formatting markdown files

parent fdeb0ab7
Pipeline #365 failed with stages
in 6 seconds
## How to contribute code to OpsTheater:
If you want to have a look at puppetised code for OpsTheater, you can check that on this git repository : *https://gitlab.olindata.com/opstheater/opstheater*
If you want to have a look at puppetised code for OpsTheater, you can check that on this git repository: <https://gitlab.olindata.com/opstheater/opstheater>
Please follow the below steps for contributing :
......@@ -13,11 +13,11 @@ You can contribute your code in this local directory and push it to a new branch
```sh
checkout -b <author>/[fixes|features]/<name>
```
Now you will be on a new branch that you have just create now, to check the same run command
Now you will be on a new branch that you have just created now, to check the same run command
```sh
git branch
```
Now once you have done with your code you will need to push it to the repository with following steps:
Now once you are done with your code you will need to push it to the repository with following steps:
```sh
git add <file name>
......@@ -29,28 +29,3 @@ git push origin <branch name>
This step will push your changes to the repository `opstheater` on the branch you created.
Now you can request someone else on the team to check your code and merge it with the original repository.
## Deploying your environment with R10K :
R10K is a hybrid solution for deploying Puppet code. It implements the original git workflow for deploying Puppet environments based on Git branches.
You can install r10k directly with command
```sh
gem install r10k
```
Now go to path **/etc/puppetlabs/r10k** and create file **r10k.yaml** with content as :
```sh
:cachedir: '/var/cache/r10k'
:sources:
:local:
remote: 'git@gitlab.olindata.com:opstheater/opstheater.git'
basedir: '/etc/puppetlabs/code/environments'
```
**Note: the value of basedir should be same as environmentpath in puppet.conf**
Now you can deploy your whole environment using r10k using following command :
```sh
r10k deploy environment <environment name>
```
Here environment of your branch in the repository will act as environment name.
So when when you will run r10k deploy with your branch name as environment name it will create an environment with your branch name in your local system on path **/etc/puppetlabs/code/environments**.
......@@ -3,7 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
if ENV.key?('PUPPET_VERSION')
puppetversion = "= #{ENV['PUPPET_VERSION']}"
else
puppetversion = ['>= 3.5']
puppetversion = ['>= 4.0']
end
gem 'rake'
......
......@@ -4,10 +4,10 @@
Status](https://gitlab.olindata.com/opstheater/opstheater/badges/production/build.svg)](https://gitlab.olindata.com/opstheater/opstheater/builds/)
## Content
1. Opstheater
2. Branches
3. Installation
4. Need help?
1. Opstheater
2. Branches
3. Installation
4. Need help?
## OpsTheater
......@@ -17,30 +17,26 @@ Opstheater is a fully Open Source stack of tools for managing infrastructure as
Opstheater has a few different branches, which you can use for different purposes.
* 1.6 stable
* The latest stable version of Opstheater.
* Production
* This is the latest production environment of Opstheater.
* Develop
* Development environment for developer, stable.
* Refactoring
* Development environment mostly for trying out things (it can be unstable).
* 1.6 stable
* The latest stable version of Opstheater.
* Production
* This is the latest production environment of Opstheater.
* Develop
* Development environment for developer, stable.
* Refactoring
* Development environment mostly for trying out things (it can be unstable).
## Installation
We have three different style of deployment.
We have three different style of deployment.
* For development purposes please follow the instructions here. (link: https://gitlab.olindata.com/opstheater/opstheater-docs/blob/master/1.6/deployment/development.md)
* For development purposes please follow the instructions here. (link: <https://gitlab.olindata.com/opstheater/opstheater-docs/blob/master/1.6/deployment/development.md>)
* For trying out Opstheater for later production deployment, please use this instructions(this moment we suggest you to use the “develop” branch).
* For trying out Opstheater for later production deployment, please use thi instructions (this moment we suggest you to use the “develop” branch).
## Need Help?
Need help? Try one of these:
* Google Group: email at opstheater@googlegroups.com or https://groups.google.com/forum/#!forum/opstheater
* chat with us on freenode IRC #opstheater
* coming soon: a public mattermost team
* Google Group: email at opstheater <AT> googlegroups <DOT> com or <https://groups.google.com/forum/#!forum/opstheater>
* chat with us on freenode IRC #opstheater
# OpsTheater
[![Build
Status](https://gitlab.olindata.com/opstheater/opstheater/badges/production/build.svg)](https://gitlab.olindata.com/opstheater/opstheater/builds/)
## Getting started
If you wish to try out OpsTheater in a development setup, please look at the instructions here: https://gitlab.olindata.com/opstheater/opstheater-docs/blob/master/1.6/deployment/development.md
## Need Help?
Need help? Try one of these:
* Google Group: email at opstheater@googlegroups.com or https://groups.google.com/forum/#!forum/opstheater
* chat with us on freenode IRC #opstheater
* coming soon: a public mattermost team
\ No newline at end of file
......@@ -7,13 +7,13 @@ This is a Major Milestone Release of Opstheater. We go OpenSource with 1.6
In this release the number of changes is limited as most of the capacity in this sprint was used to make open sourcing the code possible.
The following has been added along the way:
* Logstash filters for filtering access logs of following components:
* Puppetmaster
* PupptDB
* Gitlab
* Mattermost
* Used Puppet Lint to make sure that all our puppet code is following Puppetlabs style guide and we pass an initial CI build on each push to gitlab
* removed sensitive code, updated lots of references to things and generally cleaned up a bunch of things.
* Logstash filters for filtering access logs of following components:
* Puppetmaster
* PupptDB
* Gitlab
* Mattermost
* Used Puppet Lint to make sure that all our puppet code is following Puppetlabs style guide and we pass an initial CI build on each push to gitlab
* removed sensitive code, updated lots of references to things and generally cleaned up a bunch of things.
In addition to this, we have updated the components in use by OpsTheater to the following versions, each of which comes with it's own release notes:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment