diff --git a/playbooks/common-tasks/os-log-dir-setup.yml b/playbooks/common-tasks/os-log-dir-setup.yml deleted file mode 100644 index 110ae73ee5..0000000000 --- a/playbooks/common-tasks/os-log-dir-setup.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -# 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. - -# Usage: -# This common task is used to create log directories and links -# if the "log_dirs" list is passed. "log_dirs" must be used -# containing at least one dictionary with the keys "dest" and -# "src". Optionally the "owner" and "group" can be provided as well. -# * dest = destination -# * src = source -# * owner = user -# * group = group - -- name: Create log dir - file: - path: "{{ item.src }}" - state: directory - with_items: "{{ log_dirs|default([]) }}" - when: is_metal | bool - tags: - - common-log - -- name: Create log aggregation links - file: - src: "{{ item.src }}" - dest: "{{ item.dest }}" - state: "link" - force: "yes" - with_items: "{{ log_dirs|default([]) }}" - when: is_metal | bool - tags: - - common-log diff --git a/playbooks/unbound-install.yml b/playbooks/unbound-install.yml index 3b3be2d8f1..d44a9d0aae 100644 --- a/playbooks/unbound-install.yml +++ b/playbooks/unbound-install.yml @@ -25,8 +25,6 @@ serial: "{{ unbound_serial | default(['1','100%']) }}" user: root pre_tasks: - - name: Including os-log-dir-setup tasks - include_tasks: common-tasks/os-log-dir-setup.yml - name: Including container-setup tasks include_role: name: "openstack.osa.{{ container_tech | default('lxc') }}_container_setup" diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml index 3d21b4b905..3f9422a0eb 100644 --- a/playbooks/utility-install.yml +++ b/playbooks/utility-install.yml @@ -53,13 +53,6 @@ name: "openstack.osa.{{ container_tech | default('lxc') }}_container_setup" when: not is_metal - - name: Including os-log-dir-setup tasks - include_tasks: common-tasks/os-log-dir-setup.yml - vars: - log_dirs: - - src: "/openstack/log/{{ inventory_hostname }}-utility" - dest: "/var/log/utility" - - name: Including unbound-clients tasks include_tasks: common-tasks/unbound-clients.yml when: diff --git a/playbooks/zookeeper-install.yml b/playbooks/zookeeper-install.yml index 3db72b057b..2ec867a98b 100644 --- a/playbooks/zookeeper-install.yml +++ b/playbooks/zookeeper-install.yml @@ -26,8 +26,6 @@ user: root environment: "{{ deployment_environment_variables | default({}) }}" pre_tasks: - - name: Including os-log-dir-setup tasks - include_tasks: common-tasks/os-log-dir-setup.yml - name: Including container-setup tasks include_role: name: "openstack.osa.{{ container_tech | default('lxc') }}_container_setup"