commit 4d3ab451fabf5c61c18803736d3516585a82ab45
author Ondrej Smola <osmola@mirantis.com> Mon Jun 04 08:34:50 2018 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> Mon Jun 04 08:34:50 2018 +0000
tree d9ba2334e9173585a13cb2a3b7ffa41d6e84b342
parent 70e0c9ed7ac92701e5c750662f5761e2d4048d43
parent f1fcc9279fe279654c77d8b3fa4fd65faa84ee68

Merge "Change the way how curator remove indices"

jenkins/client/job/salt-formulas/tests.yml

diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 07a8fb4..d2f1199 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -176,6 +176,12 @@
               PARALLEL_GROUP_SIZE:
                 type: string
                 default: "8"
+              RUN_TEST_IN_DOCKER:
+                type: boolean
+                description: "Run test stage in docker environment"
+              SMOKE_TEST_DOCKER_IMG:
+                type: string
+                default: "ubuntu:16.04"
       job:
         test-salt-formulas-env:
           name: test-salt-formulas-env

kubernetes/control/roles/cluster-admin.yml

diff --git a/kubernetes/control/roles/cluster-admin.yml b/kubernetes/control/roles/cluster-admin.yml
new file mode 100644
index 0000000..6ee5d7d
--- /dev/null
+++ b/kubernetes/control/roles/cluster-admin.yml
@@ -0,0 +1,2 @@
+classes:
+  - service.kubernetes.control.roles.cluster-admin
\ No newline at end of file

kubernetes/control/roles/fluentd-view.yml

diff --git a/kubernetes/control/roles/fluentd-view.yml b/kubernetes/control/roles/fluentd-view.yml
new file mode 100644
index 0000000..b7ab403
--- /dev/null
+++ b/kubernetes/control/roles/fluentd-view.yml
@@ -0,0 +1,2 @@
+classes:
+  - service.kubernetes.control.roles.fluentd-view
\ No newline at end of file