doc fixes
diff --git a/README.md b/README.md
deleted file mode 100644
index f5acedc..0000000
--- a/README.md
+++ /dev/null
@@ -1,130 +0,0 @@
-
-# Jenkins continuos integration
-
-Jenkins is an application that monitors executions of repeated jobs, such as building a software project or jobs run by cron.
-
-## Sample pillars
-
-Jenkins masters
-
-Jenkins master with user
-
- jenkins:
- master:
- enabled: true
- http:
- address: 0.0.0.0
- port: 8080
- protocol: http
- plugins:
- - name: git
- - name: metadata
- - name: envinject
- - name: greenballs
- - name: ansicolor
- - name: build-pipeline-plugin
- user:
- admin:
- api_token: api_token
- password_hash: salt:hashed_pwd_see_usage
- email: root@dmain.com
- public_keys:
- - key: ssh_public_key_of_current_root_user
- slaves:
- - name: slave1.domain.com
- executors: 2
-
-Jenkins master with SSL
-
- jenkins:
- master:
- enabled: true
- http:
- address: 0.0.0.0
- port: 8080
- protocol: https
- ssl:
- enabled: true
- host: ci.domain.com
- authority: Org_Service_CA
- plugins:
- - name: git
- - name: metadata
- - name: envinject
- - name: greenballs
- - name: ansicolor
- - name: build-pipeline-plugin
- slaves:
- - name: slave1.domain.com
- executors: 2
-
-### Jenkins job builder
-
-Jenkins job builder to configure master
-
- jenkins:
- job_builder:
- enabled: true
- source: git
- address: https://git.openstack.org/openstack-infra/jenkins-job-builder
- branch: master
- config:
- source: git
- address: git@repo.domain.com:jenkins/jobs-org.git
- branch: develop
- master:
- host: localhost
- port: 8080
- protocol: http
- user: admin
- password: fsdfsdf9438r4fessc9sd
-
-### Jenkins slaves
-
-Slave with sudo :o
-
- jenkins:
- slave:
- enabled: true
- sudo: true
- master:
- host: localhost
- port: 8080
- protocol: http
- user:
- name: admin
- password: password
-
-Jenkins slave with keystone credentials
-
- jenkins:
- slave:
- enabled: true
- master:
- host: localhost
- port: 8080
- protocol: http
- user:
- name: admin
- password: password
- keystone:
-
-## Usage
-
-User password generation. foo is password. bar is salt.
-
- echo -n 'foo{bar}' | sha256sum
-
-## Read more
-
-* https://wiki.jenkins-ci.org/display/JENKINS/Use+Jenkins
-* https://wiki.jenkins-ci.org/display/JENKINS/Installing+Jenkins+on+Ubuntu
-* https://github.com/jenkinsci/puppet-jenkins
-* https://wiki.jenkins-ci.org/display/JENKINS/Distributed+builds
-* http://ci.openstack.org/jenkins-job-builder/
-* http://ci.openstack.org/jjb.html
-* http://techs.enovance.com/6006/manage-jenkins-jobs-with-yaml
-* http://zeroturnaround.com/rebellabs/top-10-jenkins-featuresplugins/
-* https://wiki.jenkins-ci.org/display/JENKINS/Build+Pipeline+Plugin
-* https://wiki.jenkins-ci.org/display/JENKINS/LTS+Release+Line
-* https://gist.github.com/rowan-m/1026918
diff --git a/README.rst b/README.rst
index 9a006c9..3b817b6 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@
Jenkins
=======
-Install and configure Jenkins master and slave.
+Jenkins is an application that monitors executions of repeated jobs, such as building a software project or jobs run by cron.
Available states
================
@@ -42,28 +42,13 @@
Setup Jenkins slave
-Configuration parameters
-========================
-
-
-Example reclass
+Example pillars
===============
-Master
-------
+Jenkins master
.. code-block:: yaml
- classes:
- - service.jenkins.master
-
- parameters:
- _param:
- jenkins_admin_token: xyz
- jenkins_admin_password_hash: xyz
- jenkins_admin_password: xyz
- job_builder_config_address: git@github.com:xyz/myjobs.git
- job_builder_config_branch: master
nginx:
server:
site:
@@ -102,36 +87,37 @@
- name: rebuild
- name: test-stability
-Slave
------
+Jenkins slave
.. code-block:: yaml
- classes:
- - service.jenkins.slave.single
- - service.java.environment
+ jenkins:
+ slave:
+ master:
+ host: jenkins.example.com
+ port: 80
+ user:
+ name: jenkins_slave
+ password: dexiech6AepohthaiHook2iesh7ol5ook4Ov3leid3yek6daid2ooNg3Ee2oKeYo
+ gpg:
+ keypair_id: A76882D3
+ public_key: |
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+ ...
+ private_key: |
+ -----BEGIN PGP PRIVATE KEY BLOCK-----
+ ...
- parameters:
- _param:
- java_environment_platform: openjdk
- java_environment_version: 7
+Usage
+=====
- jenkins:
- slave:
- master:
- host: jenkins.example.com
- port: 80
- user:
- name: jenkins_slave
- password: dexiech6AepohthaiHook2iesh7ol5ook4Ov3leid3yek6daid2ooNg3Ee2oKeYo
- gpg:
- keypair_id: A76882D3
- public_key: |
- -----BEGIN PGP PUBLIC KEY BLOCK-----
- ...
- private_key: |
- -----BEGIN PGP PRIVATE KEY BLOCK-----
- ...
+Generate password hash:
+
+.. code-block:: bash
+
+ echo -n "salt{plainpassword}" | openssl dgst -sha256
+
+Place in the configuration ``salt:hashpassword``.
Read more
=========