From 7c777eabaaa3353eb375c54d5dab8b0679c862f3 Mon Sep 17 00:00:00 2001
From: Przemyslaw Kaminski <pkaminski@mirantis.com>
Date: Fri, 17 Jul 2015 09:30:59 +0200
Subject: [PATCH] Small resources fixes

---
 resources/keystone_service_endpoint/test.py   | 2 +-
 resources/mariadb_db/meta.yaml                | 2 ++
 resources/mariadb_keystone_db/actions/run.yml | 2 ++
 resources/mariadb_service/meta.yaml           | 3 +++
 resources/mariadb_user/meta.yaml              | 3 +++
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/keystone_service_endpoint/test.py b/resources/keystone_service_endpoint/test.py
index 34f7b66d..edeede03 100644
--- a/resources/keystone_service_endpoint/test.py
+++ b/resources/keystone_service_endpoint/test.py
@@ -18,7 +18,7 @@ def test(resource):
     resp_json = resp.json()
     assert 'services' in resp_json
 
-    service = [s for s in resp_json['services'] if s['name'] == resource.name][0]
+    service = [s for s in resp_json['services'] if s['name'] == resource.args['endpoint_name'].value][0]
     service_id = service['id']
 
     assert service['description'] == resource.args['description'].value
diff --git a/resources/mariadb_db/meta.yaml b/resources/mariadb_db/meta.yaml
index 285aafdb..f60ddfb6 100644
--- a/resources/mariadb_db/meta.yaml
+++ b/resources/mariadb_db/meta.yaml
@@ -8,6 +8,7 @@ input:
     db_name:
       schema: str!
       value:
+
     login_user:
       schema: str!
       value:
@@ -17,6 +18,7 @@ input:
     login_port:
       schema: int!
       value:
+
     ip:
       schema: str!
       value:
diff --git a/resources/mariadb_keystone_db/actions/run.yml b/resources/mariadb_keystone_db/actions/run.yml
index 4b315b9b..3c1d25d6 100644
--- a/resources/mariadb_keystone_db/actions/run.yml
+++ b/resources/mariadb_keystone_db/actions/run.yml
@@ -4,6 +4,8 @@
     - name: mariadb db
       mysql_db:
         name: {{ db_name }}
+        #collation: utf8_encode_ci
+        encoding: utf8
         state: present
         login_user: root
         login_password: {{ login_password }}
diff --git a/resources/mariadb_service/meta.yaml b/resources/mariadb_service/meta.yaml
index e4efaa80..e540d499 100644
--- a/resources/mariadb_service/meta.yaml
+++ b/resources/mariadb_service/meta.yaml
@@ -5,6 +5,9 @@ input:
     image: 
       schema: str!
       value: mariadb
+    root_user:
+      schema: str!
+      value: root
     root_password:
       schema: str!
       value: mariadb
diff --git a/resources/mariadb_user/meta.yaml b/resources/mariadb_user/meta.yaml
index fe179095..56c70a30 100644
--- a/resources/mariadb_user/meta.yaml
+++ b/resources/mariadb_user/meta.yaml
@@ -11,9 +11,11 @@ input:
     user_name:
       schema: str!
       value:
+
     db_name:
       schema: str!
       value:
+
     login_password:
       schema: str!
       value:
@@ -23,6 +25,7 @@ input:
     login_user:
       schema: str!
       value:
+
     ip:
       schema: str!
       value: