Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use uri module for git sourced configs
The current mechanism uses a lookup, causing the fetch of the default templates to happen via curl from the deployment node. This causes problems if the deployment node does not have access to the repo server web service, which may be the case in high security environments. This patch changes the mechanism to only use the lookup module for the file content that is on the deployment node, then falls back to using the uri module to fetch the default content. This ensures that the deployment node does not have to reach into the environment for the content. Also, in https://review.openstack.org/446235 a new task was added to template the paste/policy files from the git source but the owner/group/mode settings were not implemented. This patch consolidates the two config_template tasks into one and ensures that the owner/group/mode settings are properly implemented for all the files. Change-Id: I47de2e4b1c864035c8b686e96e65722f312b7280
- Loading branch information
Jesse Pretorius
committed
May 19, 2017
1 parent
3eab9a2
commit c593873
Showing
2 changed files
with
41 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
--- | ||
# Copyright 2017, 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. | ||
|
||
# These vars find a file on the deployment node, if it exists - otherwise the result is empty. | ||
keystone_paste_user_content: "{{ lookup('pipe', 'cat ' ~ keystone_paste_default_file_path ~ ' 2>/dev/null || true') }}" | ||
keystone_policy_user_content: "{{ lookup('pipe', 'cat ' ~ keystone_policy_default_file_path ~ ' 2>/dev/null || true') }}" | ||
keystone_sso_callback_user_content: "{{ lookup('pipe', 'cat ' ~ keystone_sso_callback_file_path ~ ' 2>/dev/null || true') }}" | ||
|
||
# These vars find the appropriate result content from the with_items loop | ||
keystone_paste_default_content: | | ||
{{ _git_file_fetch.results | selectattr('item', 'equalto', keystone_git_config_lookup_location ~ '/' ~ keystone_paste_git_file_path) | map(attribute='content') | first }} | ||
keystone_sso_callback_default_content: | | ||
{{ _git_file_fetch.results | selectattr('item', 'equalto', keystone_git_config_lookup_location ~ '/' ~ keystone_sso_callback_git_file_path) | map(attribute='content') | first }} |