
In https://review.openstack.org/309425 adjustments were made which resulted in keystone_idp and keystone_sp to always be defined. Unfortunately the CentOS support for os_keystone merged after that and reviews did not pick up the necessary changes. This patch corrects it so that the repo and packages are only installed if necessary. Additionally, the Federation SP callback template was being unnecessarily copied over. It will now only copy over when it will be used. Change-Id: I466f1391893d33be7c83caba70ec93e44dd1d482
64 lines
2.0 KiB
YAML
64 lines
2.0 KiB
YAML
---
|
|
# Copyright 2014, Rackspace US, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
- name: Copy keystone config
|
|
config_template:
|
|
src: "{{ item.src }}"
|
|
dest: "{{ item.dest }}"
|
|
owner: "{{ keystone_system_user_name }}"
|
|
group: "{{ keystone_system_group_name }}"
|
|
mode: "0644"
|
|
config_overrides: "{{ item.config_overrides }}"
|
|
config_type: "{{ item.config_type }}"
|
|
with_items:
|
|
- src: "keystone.conf.j2"
|
|
dest: "/etc/keystone/keystone.conf"
|
|
config_overrides: "{{ keystone_keystone_conf_overrides }}"
|
|
config_type: "ini"
|
|
- src: "keystone-paste.ini.j2"
|
|
dest: "/etc/keystone/keystone-paste.ini"
|
|
config_overrides: "{{ keystone_keystone_paste_ini_overrides }}"
|
|
config_type: "ini"
|
|
- src: "policy.json.j2"
|
|
dest: "/etc/keystone/policy.json"
|
|
config_overrides: "{{ keystone_policy_overrides }}"
|
|
config_type: "json"
|
|
notify:
|
|
- Restart Keystone APIs
|
|
- Restart service
|
|
|
|
- name: Copy Keystone Federation SP SSO callback template
|
|
copy:
|
|
src: "sso_callback_template.html"
|
|
dest: "/etc/keystone/sso_callback_template.html"
|
|
owner: "{{ keystone_system_user_name }}"
|
|
group: "{{ keystone_system_group_name }}"
|
|
mode: "0644"
|
|
when:
|
|
- keystone_idp != {}
|
|
notify:
|
|
- Restart Keystone APIs
|
|
- Restart service
|
|
|
|
- name: Clean up Keystone Federation SP SSO callback template
|
|
file:
|
|
path: "/etc/keystone/sso_callback_template.html"
|
|
state: absent
|
|
when:
|
|
- keystone_idp == {}
|
|
notify:
|
|
- Restart Keystone APIs
|
|
- Restart service
|