commit a67951eb178c438c6e9db026330f68f72c42ae01
author Tomas Kukral <tkukral@mirantis.com> Thu Jun 01 13:30:18 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Thu Jun 01 13:30:18 2017 +0000
tree 91d8b816b119f83a4f5f8e09264b2e061b65108a
parent 18b76690ec36e6d1f3d9a0290cb43dd9eabfdfd7
parent 689cf87046be6f9d729fe7678577b0e6f0799524

Merge "Simplify Grafana metadata support"

README.rst

diff --git a/README.rst b/README.rst
index 315a648..f624f81 100644
--- a/README.rst
+++ b/README.rst
@@ -232,6 +232,7 @@
             kubelet: 7bN5hJ9JD4fKjnFTkUKsvVNfuyEddw3r
           version: v1.2.4
 
+
 Kubernetes with OpenContrail network plugin
 ------------------------------------------------
 

kubernetes/master/setup.sls

diff --git a/kubernetes/master/setup.sls b/kubernetes/master/setup.sls
index f994d6a..694b4b2 100644
--- a/kubernetes/master/setup.sls
+++ b/kubernetes/master/setup.sls
@@ -40,4 +40,5 @@
 
 {%- endif %}
 
+
 {%- endif %}

tests/pillar/master_cluster.sls

diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index 05434a1..86f0193 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -79,3 +79,10 @@
         enabled: true
     hyperkube:
       hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
+    services:
+      myservice:
+        enabled: true
+        files:
+          - /srv/kubernetes/myservice-svc.yml
+          - /srv/kubernetes/myservice-pvc.yml
+          - /srv/kubernetes/myservice-deploy.yml