From 37165b14582ee19602638f7dcf242fe21f361ba4 Mon Sep 17 00:00:00 2001
From: Michael Rice <michael.rice@rackspace.com>
Date: 2016年5月16日 22:39:22 -0500
Subject: [PATCH] cloudkitty signing dir
Adds a task to fix the signing dir for cloudkitty
---
 defaults/main.yml &#124; 5 +++--
 tasks/cloudkitty_pre_install.yml &#124; 10 ++++++++++
 templates/cloudkitty.conf.j2 &#124; 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index 7c1c833..7d7a5ee 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -62,6 +62,7 @@ cloudkitty_keystone_trustee_auth_plugin: v2password
 cloudkitty_output_backend: cloudkitty.backend.file.FileBackend
 cloudkitty_output_pipline: osrf
 cloudkitty_output_basepath: /var/cloudkitty/reports
+cloudkitty_signing_dir: /var/cache/cloudkitty
 
 cloudkitty_galera_database: cloudkitty
 cloudkitty_galera_user: cloudkitty
@@ -87,8 +88,8 @@ cloudkitty_policy_overrides: {}
 cloudkitty_api_paste_ini_overrides: {}
 cloudkitty_service_name: cloudkitty
 cloudkitty_service_names:
- - cloudkitty_api
- - cloudkitty_processor
+ - cloudkitty-api
+ - cloudkitty-processor
 
 cloudkitty_pip_packages:
 - cloudkitty
diff --git a/tasks/cloudkitty_pre_install.yml b/tasks/cloudkitty_pre_install.yml
index e6b0ccd..7a0a86c 100644
--- a/tasks/cloudkitty_pre_install.yml
+++ b/tasks/cloudkitty_pre_install.yml
@@ -97,3 +97,13 @@
 mode: 0755
 tags:
 - cloudkitty-dirs
+
+- name: Create cloudkitty signing dir
+ file:
+ path: "{{ cloudkitty_signing_dir }}"
+ state: directory
+ owner: "{{ cloudkitty_system_user_name }}"
+ group: "{{ cloudkitty_system_group_name }}"
+ mode: 0700
+ tags:
+ - cloudkitty-dirs
diff --git a/templates/cloudkitty.conf.j2 b/templates/cloudkitty.conf.j2
index 57e5047..8cc9299 100644
--- a/templates/cloudkitty.conf.j2
+++ b/templates/cloudkitty.conf.j2
@@ -21,7 +21,7 @@ connection = {{ cloudkitty_database_connection }}
 
 [keystone_authtoken]
 memcached_servers = {{ memcached_servers }}
-signing_dir = /var/cache/cloudkitty
+signing_dir = {{ cloudkitty_signing_dir }}
 auth_uri = {{ keystone_service_internaluri }}
 project_domain_id = {{ cloudkitty_service_project_domain_id }}
 project_name = {{ cloudkitty_service_project_name }}
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/openstack-ansible-os_cloudkitty/commit/37165b14582ee19602638f7dcf242fe21f361ba4.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/openstack-ansible-os_cloudkitty/commit/37165b14582ee19602638f7dcf242fe21f361ba4.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>