From 38340cf4bd2337676b185d1418b64c4efeb736de Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotjagov <dmitriy.r@sitevalley.com>
Date: Thu, 8 Nov 2018 21:00:53 +0200
Subject: [PATCH] coordination_url should be placed in DEFAULT section

According to gnocchi docs, coordination_url should be placed in DEFAULT section now
Otherwise deprecation warning is shown.
https://gnocchi.xyz/install.html#gnocchi-configuration-sample

Fixed test-install-gnocchi.yml syntax

Change-Id: Ief9073cf2f9c876c4c1a91568aab6a79d22ab626
---
 templates/gnocchi.conf.j2      | 2 +-
 tests/test-install-gnocchi.yml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/templates/gnocchi.conf.j2 b/templates/gnocchi.conf.j2
index 61b1c30..5cb1334 100644
--- a/templates/gnocchi.conf.j2
+++ b/templates/gnocchi.conf.j2
@@ -5,6 +5,7 @@
 use_stderr = False
 debug = {{ debug }}
 fatal_deprecations = {{ gnocchi_fatal_deprecations }}
+coordination_url = {{ gnocchi_coordination_url }}
 
 [api]
 auth_mode = {{ gnocchi_auth_mode }}
@@ -42,7 +43,6 @@ memcache_secret_key = {{ memcached_encryption_key }}
 
 [storage]
 driver = {{ gnocchi_storage_driver }}
-coordination_url = {{ gnocchi_coordination_url }}
 {% if gnocchi_storage_driver == 'file' %}
 ############
 ## File Storage
diff --git a/tests/test-install-gnocchi.yml b/tests/test-install-gnocchi.yml
index 89c9fca..f778f11 100644
--- a/tests/test-install-gnocchi.yml
+++ b/tests/test-install-gnocchi.yml
@@ -21,7 +21,8 @@
     - common/test-vars.yml
   pre_tasks:
     - include_tasks: common/create-grant-db.yml
-      db_password: "{{ gnocchi_container_mysql_password }}"
-      db_name: "gnocchi"
+      vars:
+        db_password: "{{ gnocchi_container_mysql_password }}"
+        db_name: "gnocchi"
   roles:
     - role: "os_gnocchi"