openstack/openstack-ansible
Code Issues Proposed changes

Removed all rackspace related logging parts

Browse Source 
This commit removes all of the rackspace related logging components.
This change is part 1 of 3 to update all of the logging bits within
the stack such that they're made more generic and community
consumable.

Plays removed:
* rsyslog-install.yml

Roles removed:
* rsyslog_setup

Variable changes:
* The default kibana and elasticsreach variables were removed.

Example config changes:
* The environment map was updated with the removed logging comonents.

Gate changes:
* rsyslog-install has been removed from the gating script as it no longer
  serves the same purpose.
* The kibana variable override was removed.
* Kibana entries in `haproxy_config.yml` have been removed.

DocImpact
Implements: blueprint rsyslog-update

Change-Id: Icd25653a29c9936cecc63ba5dc82aeb1cfb7ebd8
This commit is contained in:
Kevin Carter 2015-03-14 13:58:58 -05:00
parent af64fa9f1f
commit a90b8c71b3
22 changed files with 8 additions and 715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
development-stack.rst
View File

@ -113,12 +113,12 @@ Diagram::
| ^ * | |
*-[ LXC ]*--*--------------------|-----|------|----| |
| | | | | | | |
| * | | | | | |
| --->[ Logstash ]<-----------|-- | | | | |
| | [ Kibana ]<-------------| | | V * | |
| --->[ Elastic search ]<-----| | | [ Galera x3 ] |
| [ Memcached ]<----------| | | | |
*-------*[ Rsyslog ]<------------|-- | * |
| | | | | | | |
| | | | | | | |
| | | | V * | |
| * | | [ Galera x3 ] |
| [ Memcached ]<----------| | | |
*-------*[ Rsyslog ]<------------|--| | * |
| [ Repos Server x3 ]<----| ---|-->[ RabbitMQ x3 ] |
| [ Horizon ]<------------| | | |
| [ Nova api ec2 ]<-------|--| | |

41
etc/openstack_deploy/openstack_environment.yml
View File

@ -23,9 +23,6 @@ component_skel:
cinder_volume:
belongs_to:
- cinder_all
elasticsearch:
belongs_to:
- elasticsearch_all
galera:
belongs_to:
- galera_all
@ -53,12 +50,6 @@ component_skel:
keystone:
belongs_to:
- keystone_all
kibana:
belongs_to:
- kibana_all
logstash:
belongs_to:
- logstash_all
memcached:
belongs_to:
- memcached_all
@ -152,14 +143,6 @@ container_skel:
properties:
service_name: cinder
container_release: trusty
elasticsearch_container:
belongs_to:
- log_containers
contains:
- elasticsearch
properties:
service_name: elasticsearch
container_release: trusty
galera_container:
belongs_to:
- infra_containers
@ -217,22 +200,6 @@ container_skel:
properties:
service_name: keystone
container_release: trusty
kibana_container:
belongs_to:
- log_containers
contains:
- kibana
properties:
service_name: kibana
container_release: trusty
logstash_container:
belongs_to:
- log_containers
contains:
- logstash
properties:
service_name: logstash
container_release: trusty
memcached_container:
belongs_to:
- infra_containers
@ -355,15 +322,7 @@ container_skel:
container_release: trusty
rsyslog_container:
belongs_to:
- infra_containers
- os-infra_containers
- shared-infra_containers
- identity_containers
- compute_containers
- storage_containers
- log_containers
- network_containers
- repo-infra_containers
contains:
- rsyslog
properties:

2
etc/openstack_deploy/openstack_user_config.yml
View File

@ -1,5 +1,5 @@
---
environment_version: 58339ffafde4614abb7021482cc6604b
environment_version: 5fd612951c8a374e709305f29dd92054
cidr_networks:
container: 172.29.236.0/22

3
etc/openstack_deploy/user_secrets.yml
View File

@ -73,9 +73,6 @@ nova_service_password:
nova_v3_service_password:
nova_s3_service_password:
## Kibana Options
kibana_password:
## Swift Options:
swift_service_password:
swift_container_mysql_password:

4
playbooks/inventory/group_vars/all.yml
View File

@ -57,10 +57,6 @@ galera_root_user: root
# Repositories
## Logstash
logstash_port: 5544
## Pip install
# Lock down pip to only a specific version of pip
pip_get_pip_options: "--no-index --find-links={{ openstack_upstream_url }}/os-releases/{{ openstack_release }}"

1
playbooks/roles/os_swift/meta/main.yml
View File

@ -30,6 +30,5 @@ galaxy_info:
- development
- openstack
dependencies:
- rsyslog_setup
- openstack_openrc
- pip_lock_down

85
playbooks/roles/rsyslog_setup/CONTRIBUTING.rst
View File

@ -1,85 +0,0 @@
OpenStack rsyslog server
########################
:tags: openstack, rsyslog, server, cloud, ansible
:category: \*nix
contributor guidelines
^^^^^^^^^^^^^^^^^^^^^^
Filing Bugs
-----------
Bugs should be filed on Launchpad, not GitHub: "https://bugs.launchpad.net/openstack-ansible"
When submitting a bug, or working on a bug, please ensure the following criteria are met:
* The description clearly states or describes the original problem or root cause of the problem.
* Include historical information on how the problem was identified.
* Any relevant logs are included.
* The provided information should be totally self-contained. External access to web services/sites should not be needed.
* Steps to reproduce the problem if possible.
Submitting Code
---------------
Changes to the project should be submitted for review via the Gerrit tool, following
the workflow documented at: "http://docs.openstack.org/infra/manual/developers.html#development-workflow"
Pull requests submitted through GitHub will be ignored and closed without regard.
Extra
-----
Tags:
If it's a bug that needs fixing in a branch in addition to Master, add a '\<release\>-backport-potential' tag (eg ``juno-backport-potential``). There are predefined tags that will autocomplete.
Status:
Please leave this alone, it should be New till someone triages the issue.
Importance:
Should only be touched if it is a Blocker/Gating issue. If it is, please set to High, and only use Critical if you have found a bug that can take down whole infrastructures.
Style guide
-----------
When creating tasks and other roles for use in Ansible please create then using the YAML dictionary format.
Example YAML dictionary format:
.. code-block:: yaml
- name: The name of the tasks
module_name:
thing1: "some-stuff"
thing2: "some-other-stuff"
tags:
- some-tag
- some-other-tag
Example **NOT** in YAML dictionary format:
.. code-block:: yaml
- name: The name of the tasks
module_name: thing1="some-stuff" thing2="some-other-stuff"
tags:
- some-tag
- some-other-tag
Usage of the ">" and "|" operators should be limited to Ansible conditionals and command modules such as the ansible ``shell`` module.
Issues
------
When submitting an issue, or working on an issue please ensure the following criteria are met:
* The description clearly states or describes the original problem or root cause of the problem.
* Include historical information on how the problem was identified.
* Any relevant logs are included.
* If the issue is a bug that needs fixing in a branch other than Master, add the ‘backport potential’ tag TO THE ISSUE (not the PR).
* The provided information should be totally self-contained. External access to web services/sites should not be needed.
* If the issue is needed for a hotfix release, add the 'expedite' label.
* Steps to reproduce the problem if possible.

202
playbooks/roles/rsyslog_setup/LICENSE
View File

@ -1,202 +0,0 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright {yyyy} {name of copyright owner}
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.

14
playbooks/roles/rsyslog_setup/README.rst
View File

@ -1,14 +0,0 @@
OpenStack rsyslog server
########################
:tags: openstack, rsyslog, server, cloud, ansible
:category: \*nix
Role to deploy rsyslog for use within OpenStack when deploying services using containers.
.. code-block:: yaml
- name: Install rsyslog
hosts: rsyslog
user: root
roles:
- { role: "rsyslog_setup", tags: [ "rsyslog-setup" ] }

24
playbooks/roles/rsyslog_setup/defaults/main.yml
View File

@ -1,24 +0,0 @@
---
# 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.
rsyslog_apt_repos:
- { repo: "ppa:adiscon/v8-stable", state: "present" }
rsyslog_apt_packages:
- rsyslog
rsyslog_pip_packages:
- python-memcached
- pycrypto

32
playbooks/roles/rsyslog_setup/meta/main.yml
View File

@ -1,32 +0,0 @@
---
# 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.
galaxy_info:
author: rcbops
description: Rsyslog install and setup for logstash
company: Rackspace
license: Apache2
min_ansible_version: 1.6.6
platforms:
- name: Ubuntu
versions:
- trusty
categories:
- cloud
- rsyslog
- development
- openstack
dependencies:
- pip_lock_down

18
playbooks/roles/rsyslog_setup/tasks/main.yml
View File

@ -1,18 +0,0 @@
---
# 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.
- include: rsyslog_pre_install.yml
- include: rsyslog_install.yml
- include: rsyslog_post_install.yml

40
playbooks/roles/rsyslog_setup/tasks/rsyslog_install.yml
View File

@ -1,40 +0,0 @@
---
# 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: Install rsyslog packages
apt:
pkg: "{{ item }}"
state: latest
update_cache: yes
cache_valid_time: 600
register: install_packages
until: install_packages|success
retries: 5
delay: 2
with_items: rsyslog_apt_packages
tags:
- rsyslog-apt-packages
- name: Install pip packages
pip:
name: "{{ item }}"
state: present
register: install_packages
until: install_packages|success
retries: 5
delay: 2
with_items: rsyslog_pip_packages
tags:
- rsyslog-pip-packages

45
playbooks/roles/rsyslog_setup/tasks/rsyslog_post_install.yml
View File

@ -1,45 +0,0 @@
---
# 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: Stop rsyslog
service:
name: "rsyslog"
state: "stopped"
failed_when: false
tags:
- rsyslog-config
- name: Rsyslog Setup
template:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
owner: "root"
group: "root"
with_items:
- { src: "50-default.conf.j2", dest: "/etc/rsyslog.d/50-default.conf" }
tags:
- rsyslog-config
- name: Generate Config Files
shell: "/opt/genlog.py > /etc/rsyslog.d/51-openstack.conf"
tags:
- rsyslog-config
- name: Start rsyslog
service:
name: "rsyslog"
state: "started"
tags:
- rsyslog-config

35
playbooks/roles/rsyslog_setup/tasks/rsyslog_pre_install.yml
View File

@ -1,35 +0,0 @@
---
# 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: Deploy rsyslog config generator
template:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
owner: "root"
group: "root"
mode: "0755"
with_items:
- { src: "genlog.py.j2", dest: "/opt/genlog.py" }
tags:
- rsyslog-config
- name: Ensure ownership on /var/spool/rsyslog
file:
path: "/var/spool/rsyslog"
state: "directory"
owner: "syslog"
group: "syslog"
tags:
- rsyslog-dirs

16
playbooks/roles/rsyslog_setup/templates/50-default.conf.j2
View File

@ -1,16 +0,0 @@
# {{ ansible_managed }}
auth,authpriv.* /var/log/auth.log
*.*;local7.none;auth,authpriv.none /var/log/syslog
syslog.* /var/log/rsyslog.log #rsyslog error messages
kern.* /var/log/kern.log
mail.* /var/log/mail.log
#user.* /var/log/user.log
mail.err /var/log/mail.err
news.crit /var/log/news/news.crit
news.err /var/log/news/news.err
news.notice /var/log/news/news.notice
*.emerg :omusrmsg:*

61
playbooks/roles/rsyslog_setup/templates/genlog.py.j2
View File

@ -1,61 +0,0 @@
#!/usr/bin/env python
# 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.
# {{ ansible_managed }}
import os
import fnmatch
print('$ModLoad imfile\t\t# Load the imfile input module\n')
print('$ActionQueueType LinkedList\t\t# Use asynchronous processing')
print('$ActionQueueFileName srvrfwd\t\t# Set file name, also enables disk'
' mode')
print('$ActionResumeRetryCount -1\t\t# Infinite retries on insert failure')
print('$ActionQueueSaveOnShutdown on\t\t# Save in-memory data if rsyslog'
' shuts down\n')
matches = []
for root, dirnames, filenames in os.walk('/openstack/log'):
for filename in fnmatch.filter(filenames, '*.log'):
matches.append(os.path.join(root, filename))
for log in matches:
container = log.split('/')[3]
service = log.split('/')[4].split('.')[0]
if 'horizon' in container:
service = container + '_' + service
if 'logstash' in container:
continue
print('$InputFileName {}'.format(log))
print('$InputFileTag {}.{}:'.format(container, service))
print('$InputFileStateFile state-{}-{}'.format(container, service))
print('$InputFileFacility local7')
print('$InputRunFileMonitor\n')
{% raw %}
print(r'$template ls_json,"{%timestamp:::date-rfc3339,jsonf:@timestamp%,'
'%source:::jsonf:@source_host%,\"@source\":\"syslog://%app-name::'
':json%\",\"@message\":\"%msg:::json%\",\"@fields\":{%syslogfacil'
'ity-text:::jsonf:facility%,%syslogseverity-text:::jsonf:severity'
'%,%app-name:::jsonf:program%,%procid:::jsonf:processid%}}"')
{% endraw %}
group = "{{ hostvars[groups['logstash_all'][0]]['ansible_ssh_host'] }}"
print('*.* @@{}:{{ logstash_port }};ls_json'.format(group))

48
playbooks/rsyslog-install.yml
View File

@ -1,48 +0,0 @@
---
# 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: Install rsyslog
hosts: rsyslog
max_fail_percentage: 20
user: root
pre_tasks:
- name: Rsyslog extra lxc config
lxc-container:
name: "{{ container_name }}"
container_command: |
[[ ! -d "/openstack/log" ]] && mkdir -p "/openstack/log"
container_config:
- "lxc.mount.entry=/openstack/log openstack/log none bind 0 0"
delegate_to: "{{ physical_host }}"
when: is_metal == false or is_metal == "False"
tags:
- rsyslog-dir
- name: Flush net cache
command: /usr/local/bin/lxc-system-manage flush-net-cache
delegate_to: "{{ physical_host }}"
tags:
- flush-net-cache
- name: Wait for container ssh
wait_for:
port: "22"
delay: 5
host: "{{ ansible_ssh_host }}"
tags:
- rsyslog-ssh-wait
roles:
- { role: "rsyslog_setup", tags: [ "rsyslog-setup" ] }
vars:
ansible_hostname: "{{ container_name }}"
is_metal: "{{ properties.is_metal|default(false) }}"

1
playbooks/setup-infrastructure.yml
View File

@ -17,5 +17,4 @@
- include: repo-install.yml
- include: galera-install.yml
- include: rabbitmq-install.yml
- include: rsyslog-install.yml
- include: utility-install.yml

24
playbooks/vars/configs/haproxy_config.yml
View File

@ -147,30 +147,6 @@ haproxy_service_configs:
haproxy_balance_alg: source
haproxy_backend_options:
- "ssl-hello-chk"
- service:
haproxy_service_name: elasticsearch
haproxy_backend_nodes: "{{ [groups['elasticsearch'][0]] }}"
haproxy_port: 9200
haproxy_balance_type: tcp
- service:
haproxy_service_name: kibana
haproxy_backend_nodes: "{{ [groups['kibana'][0]] }}"
haproxy_port: 8888
haproxy_backend_port: 80
haproxy_balance_type: http
haproxy_balance_alg: source
haproxy_backend_options:
- "forwardfor"
- "httpchk"
- "httplog"
- service:
haproxy_service_name: kibana_ssl
haproxy_backend_nodes: "{{ [groups['kibana'][0]] }}"
haproxy_port: 8443
haproxy_balance_type: tcp
haproxy_balance_alg: source
haproxy_backend_options:
- "ssl-hello-chk"
- service:
haproxy_service_name: swift_proxy
haproxy_backend_nodes: "{{ groups['swift_proxy'] }}"

3
scripts/bootstrap-aio.sh
View File

@ -232,9 +232,8 @@ fi
# Generate the passwords
scripts/pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml
# change the generated passwords for the OpenStack (admin) and Kibana (kibana) accounts
# change the generated passwords for the OpenStack (admin)
sed -i "s/keystone_auth_admin_password:.*/keystone_auth_admin_password: ${ADMIN_PASSWORD}/" /etc/openstack_deploy/user_secrets.yml
sed -i "s/kibana_password:.*/kibana_password: ${ADMIN_PASSWORD}/" /etc/openstack_deploy/user_secrets.yml
ENV_VERSION="$(md5sum /etc/openstack_deploy/openstack_environment.yml | awk '{print $1}')"
sed -i "s/environment_version:.*/environment_version: ${ENV_VERSION}/" /etc/openstack_deploy/openstack_user_config.yml
sed -i "s/external_lb_vip_address:.*/external_lb_vip_address: ${PUBLIC_ADDRESS}/" /etc/openstack_deploy/openstack_user_config.yml

12
scripts/run-playbooks.sh
View File

@ -84,14 +84,6 @@ pushd "playbooks"
fi
fi
if [ "${DEPLOY_SWIFT}" == "yes" ] || [ "${DEPLOY_OPENSTACK}" == "yes" ]; then
# Install all of rsyslog
install_bits rsyslog-install.yml
# Hard restart the rsyslog container(s)
ansible hosts -m shell -a 'for i in $(lxc-ls | grep "rsyslog"); do lxc-stop -kn $i; lxc-start -d -n $i; done'
fi
if [ "${DEPLOY_OPENSTACK}" == "yes" ]; then
# install all of the compute Bits
install_bits os-keystone-install.yml
@ -117,10 +109,6 @@ pushd "playbooks"
install_bits os-tempest-install.yml
fi
if [ "${DEPLOY_INFRASTRUCTURE}" == "yes" ] && [ "${DEPLOY_LOGGING}" == "yes" ]; then
# Reconfigure Rsyslog
install_bits rsyslog-install.yml
fi
popd
# print the report data