Fix the WARNING in copy keystone domain task

Change-Id: I2bf2e8a6ba17c813bb2b9cdf05d3062f29d9fdf6
Closes-Bug: #1653168
This commit is contained in:
Jeffrey Zhang 2017-02-05 20:48:32 +08:00
parent fee7ec052e
commit 2b402ace4d
2 changed files with 21 additions and 16 deletions

View File

@ -5,7 +5,7 @@
- name: Check if Keystone Domain specific settings enabled - name: Check if Keystone Domain specific settings enabled
local_action: stat path="{{ node_custom_config }}/keystone/domains" local_action: stat path="{{ node_custom_config }}/keystone/domains"
register: keystone_domain_cfg register: keystone_domain_directory
- name: Ensuring config directories exist - name: Ensuring config directories exist
file: file:
@ -17,17 +17,6 @@
- item.value.enabled - item.value.enabled
with_dict: "{{ keystone_services }}" with_dict: "{{ keystone_services }}"
- name: Creating Keystone Domain directory
vars:
keystone: "{{ keystone_services.keystone }}"
file:
dest: "{{ node_config_directory }}/keystone/domains/"
state: "directory"
when:
- inventory_hostname in groups[keystone.group]
- keystone.enabled | bool
- keystone_domain_cfg.stat.exists
- name: Copying over config.json files for services - name: Copying over config.json files for services
template: template:
src: "{{ item.key }}.json.j2" src: "{{ item.key }}.json.j2"
@ -65,18 +54,34 @@
- Restart keystone container - Restart keystone container
- Restart keystone-fernet container - Restart keystone-fernet container
- name: Creating Keystone Domain directory
vars:
keystone: "{{ keystone_services.keystone }}"
file:
dest: "{{ node_config_directory }}/keystone/domains/"
state: "directory"
when:
- inventory_hostname in groups[keystone.group]
- keystone.enabled | bool
- keystone_domain_directory.stat.exists
- name: Get file list in custom domains folder
local_action: find path="{{ node_custom_config }}/keystone/domains" recurse=no file_type=file
register: keystone_domains
when: keystone_domain_directory.stat.exists
- name: Copying Keystone Domain specific settings - name: Copying Keystone Domain specific settings
vars: vars:
keystone: "{{ keystone_services.keystone }}" keystone: "{{ keystone_services.keystone }}"
copy: copy:
src: "{{ item }}" src: "{{ item.path }}"
dest: "{{ node_config_directory }}/keystone/domains/" dest: "{{ node_config_directory }}/keystone/domains/"
register: keystone_domains register: keystone_domains
when: when:
- inventory_hostname in groups[keystone.group] - inventory_hostname in groups[keystone.group]
- keystone.enabled | bool - keystone.enabled | bool
with_fileglob: - keystone_domain_directory.stat.exists
- "{{ node_custom_config }}/keystone/domains/*" with_items: "{{ keystone_domains.files|default([]) }}"
notify: notify:
- Restart keystone container - Restart keystone container

View File

@ -14,7 +14,7 @@ secure_proxy_ssl_header = HTTP_X_FORWARDED_PROTO
connection = mysql+pymysql://{{ keystone_database_user }}:{{ keystone_database_password }}@{{ keystone_database_address }}/{{ keystone_database_name }} connection = mysql+pymysql://{{ keystone_database_user }}:{{ keystone_database_password }}@{{ keystone_database_address }}/{{ keystone_database_name }}
max_retries = -1 max_retries = -1
{% if keystone_domain_cfg.stat.exists %} {% if keystone_domain_directory.stat.exists %}
[identity] [identity]
domain_specific_drivers_enabled = true domain_specific_drivers_enabled = true
domain_config_dir = /etc/keystone/domains domain_config_dir = /etc/keystone/domains