Merge "Use masakari_etc_dir consistently"

This commit is contained in:
Zuul 2018-08-01 20:18:21 +00:00 committed by Gerrit Code Review
commit 556fa6cd2c
3 changed files with 5 additions and 5 deletions

View File

@ -25,15 +25,15 @@
when: item.condition | default(True)
with_items:
- src: "api-paste.ini.j2"
dest: "/etc/masakari/api-paste.ini"
dest: "{{ masakari_etc_dir }}/api-paste.ini"
config_overrides: "{{ masakari_api_paste_ini_overrides }}"
config_type: "ini"
- src: "masakari.conf.j2"
dest: "/etc/masakari/masakari.conf"
dest: "{{ masakari_etc_dir }}/masakari.conf"
config_overrides: "{{ masakari_masakari_conf_overrides }}"
config_type: "ini"
- src: "policy.json.j2"
dest: "/etc/masakari/policy.json"
dest: "{{ masakari_etc_dir }}/policy.json"
config_overrides: "{{ masakari_policy_json_overrides }}"
config_type: "json"
notify:

View File

@ -40,7 +40,7 @@
mode: "{{ item.mode|default(omit) }}"
with_items:
- { path: "/openstack", mode: "0755", owner: "root", group: "root" }
- { path: "/etc/masakari", mode: "0750" }
- { path: "{{ masakari_etc_dir }}", mode: "0750" }
- { path: "/var/cache/masakari" }
- { path: "{{ masakari_system_user_home }}" }
- { path: "{{ masakari_system_user_home }}/cache/api", mode: "0700" }

View File

@ -37,7 +37,7 @@ service_down_time = 60
[wsgi]
# The paste configuration file path
api_paste_config = /etc/masakari/api-paste.ini
api_paste_config = {{ masakari_etc_dir }}/api-paste.ini
[keystone_authtoken]
auth_url = {{ keystone_service_adminuri }}