Merge "Change the way how curator remove indices"
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
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
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