bbd70d5f9b
To cater for the situation where there are no containers, or nginx is shared in some way, it's better to add custom directives for nginx.conf into a conf.d file. That way it's never overwritten. To resolve the situation where repo_server overwrites the config laid down by os_keystone, we implement the custom log in this way. The task which verifies that the right config directories exist is modified to ensure that both the sites and the conf.d directories exist before this configuration is laid down. For CentOS/OpenSUSE they are the same directory, but for Ubuntu they are different. This patch also ensurs that the previous implementation is removed, otherwise an upgrade fails. This patch should be back portable to ensure that zero-container deploys for Queens work properly. Change-Id: I2ab0f591c1cdeae43a002d9c8cf9bbfdd69597f1
83 lines
2.5 KiB
YAML
83 lines
2.5 KiB
YAML
---
|
|
# Copyright 2016, 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: Ensure Apache is not running
|
|
service:
|
|
name: "{{ keystone_system_service_name }}"
|
|
state: stopped
|
|
failed_when: false
|
|
|
|
- name: Disable default configuration
|
|
file:
|
|
path: /etc/nginx/sites-enabled/default
|
|
state: absent
|
|
notify:
|
|
- Manage LB
|
|
- Restart web server
|
|
|
|
- name: Ensure configuration directories exist
|
|
file:
|
|
path: "{{ item }}"
|
|
state: directory
|
|
with_items:
|
|
- "/etc/nginx/{{ keystone_nginx_conf_path }}"
|
|
- "/etc/nginx/conf.d"
|
|
|
|
# TODO(odyssey4me):
|
|
# This is to cater for P->Q, Q-R upgrades and can be removed in S
|
|
- name: Remove previously implemented custom nginx log format
|
|
lineinfile:
|
|
dest: "/etc/nginx/nginx.conf"
|
|
line: "log_format custom '{{ keystone_nginx_access_log_format_combined }} {{ keystone_nginx_access_log_format_extras }}';"
|
|
state: absent
|
|
notify:
|
|
- Manage LB
|
|
- Restart web server
|
|
|
|
- name: Configure custom nginx log format
|
|
copy:
|
|
# NOTE(odyssey4me):
|
|
# To cater for the situation where there are no containers, or
|
|
# nginx is shared in some way, it's better to add custom directives
|
|
# for nginx.conf into a conf.d file. That way it's never overwritten.
|
|
content: |
|
|
# Ansible managed
|
|
log_format custom '{{ keystone_nginx_access_log_format_combined }} {{ keystone_nginx_access_log_format_extras }}';
|
|
dest: "/etc/nginx/conf.d/custom_log.conf"
|
|
notify:
|
|
- Manage LB
|
|
- Restart web server
|
|
|
|
# Configure app
|
|
- name: Configure virtual hosts
|
|
template:
|
|
src: keystone_nginx.conf.j2
|
|
dest: "/etc/nginx/{{ keystone_nginx_conf_path }}/{{ item }}.conf"
|
|
with_items: "{{ keystone_services.keys() | list }}"
|
|
notify:
|
|
- Manage LB
|
|
- Restart web server
|
|
|
|
- name: Link to enable virtual hosts
|
|
file:
|
|
src: "/etc/nginx/sites-available/{{ item }}.conf"
|
|
path: "/etc/nginx/sites-enabled/{{ item }}.conf"
|
|
state: link
|
|
with_items: "{{ keystone_services.keys() | list }}"
|
|
when: ansible_os_family == "Debian"
|
|
notify:
|
|
- Manage LB
|
|
- Restart web server
|