commit 55f59551285029dbf190fc0f10012b1d23692ac5
author Jiri Broulik <jbroulik@mirantis.com> Tue Dec 05 17:34:15 2017 +0000
committer Gerrit Code Review <gerrit2@7d672e6f81c2> Tue Dec 05 17:34:15 2017 +0000
tree 8f070eaed7938559f28c15eef1331300e61fe24c
parent fae6e489702a262cce4c74ed1cbe946526301e77
parent 43df72fd7024e102e7cf74e4e02f0eb8b89e2d81

Merge "ceph backup"

fluentd/label/default_output/file.yml

diff --git a/fluentd/label/default_output/file.yml b/fluentd/label/default_output/file.yml
index c67e1e0..80707d3 100644
--- a/fluentd/label/default_output/file.yml
+++ b/fluentd/label/default_output/file.yml
@@ -4,7 +4,6 @@
   fluentd:
     agent:
       config:
-        dollar: '$'
         label:
           default_output:
             filter:
@@ -18,9 +17,9 @@
                   - name: environment_label
                     value: ${_param:cluster_domain}
                   - name: Hostname
-                    value: ${fluentd:config:dollar}{ hostname }
+                    value: ${fluentd:dollar}{ hostname }
                   - name: Timestamp
-                    value: ${fluentd:config:dollar}{ time.strftime('%Y-%m-%dT%H:%M:%S%z') }
+                    value: ${fluentd:dollar}{ time.strftime('%Y-%m-%dT%H:%M:%S%z') }
             match:
               everything:
                 tag: '**'

opencontrail/client/resource/global_vrouter_config.yml

diff --git a/opencontrail/client/resource/global_vrouter_config.yml b/opencontrail/client/resource/global_vrouter_config.yml
index 15bf76e..9537775 100644
--- a/opencontrail/client/resource/global_vrouter_config.yml
+++ b/opencontrail/client/resource/global_vrouter_config.yml
@@ -2,7 +2,7 @@
   opencontrail:
     client:
       global_vrouter_config:
-        name: global-vrouter-config
+        name: default-global-vrouter-config
         parent_type: global-system-config
         encap_priority: "MPLSoUDP,MPLSoGRE"
         vxlan_vn_id_mode: automatic