commit 616f637854dc45e6ce2cf3c6ed289151a4c5d7b9
author Ales Komarek <akomarek@mirantis.com> Tue Jul 04 14:34:35 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jul 04 14:34:37 2017 +0000
tree ddec7de665e3843396c2398c7ddce68de056a853
parent 6d8fb0c3f04b2fe8d2424be242919e350dee9fcf
parent 3d81c6863ba300113fc4af2c2b0e0e2d1838de31

Merge changes I4d3e36d2,I675bb777

* changes:
  Add new system class for artifactory
  remove hardcoded parameter for artifactory docker image

opencontrail/client/resource/k8s_api.yml

diff --git a/opencontrail/client/resource/k8s_api.yml b/opencontrail/client/resource/k8s_api.yml
new file mode 100644
index 0000000..79d6f0d
--- /dev/null
+++ b/opencontrail/client/resource/k8s_api.yml
@@ -0,0 +1,9 @@
+parameters:
+  opencontrail:
+    client:
+      linklocal_service:
+        k8s_api:
+          lls_ip: ${_param:kubernetes_internal_api_address}
+          lls_port: 443
+          ipf_addresses: ${_param:kubernetes_control_address}
+          ipf_port: 443

telegraf/agent/init.yml

diff --git a/telegraf/agent/init.yml b/telegraf/agent/init.yml
index 0e836e8..3f6133d 100644
--- a/telegraf/agent/init.yml
+++ b/telegraf/agent/init.yml
@@ -1,5 +1,6 @@
 classes:
 - service.telegraf.agent
+- system.telegraf.sudo
 parameters:
   telegraf:
     agent:

telegraf/sudo.yml

diff --git a/telegraf/sudo.yml b/telegraf/sudo.yml
new file mode 100644
index 0000000..3fc76e1
--- /dev/null
+++ b/telegraf/sudo.yml
@@ -0,0 +1,11 @@
+parameters:
+  linux:
+    system:
+      sudo:
+        enabled: true
+        users:
+          telegraf:
+            hosts:
+            - ALL
+            commands:
+            - /usr/sbin/gluster