collect-logs: internal rename and cleanup

Follow up the rename of the role in the documentation and in absolute
paths. Also clean up the non-functional files within.

Change-Id: Idc0d60134ddbe48b4237ea56c7993d14cc22f5b1
This commit is contained in:
Attila Darazs 2016-11-22 19:30:49 +01:00
parent ef95a6bb6c
commit dbac16dfb4
11 changed files with 12 additions and 197 deletions

View File

@ -51,7 +51,7 @@ scale_args: >-
{{ pacemaker_args }}
{{ scale_extra_args }}
# options below direct automatic doc generation by tripleo-collect-logs
# options below direct automatic doc generation by collect-logs
artcl_gen_docs: true
artcl_create_docs_payload:
included_deployment_scripts:

View File

@ -1,5 +1,5 @@
ansible-role-tripleo-collect-logs
=================================
collect-logs
============
An Ansible role for aggregating logs from TripleO nodes.
@ -104,7 +104,7 @@ Example Playbook
- name: Gather logs
hosts: all:!localhost
roles:
- tripleo-collect-logs
- collect-logs
```
Templated Bash to rST Conversion Notes

View File

@ -1,5 +1,4 @@
---
# defaults file for ansible-role-tripleo-collect-logs
artcl_collect_list:
- /var/log/
@ -47,5 +46,5 @@ artcl_collect_sosreport: false
## Doc generation specific vars
artcl_gen_docs: false
artcl_docs_source_dir: "{{ local_working_dir }}/usr/local/share/ansible/roles/tripleo-collect-logs/docs/source"
artcl_docs_source_dir: "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/docs/source"
artcl_docs_build_dir: "{{ artcl_collect_dir }}/docs/build"

View File

@ -1,2 +0,0 @@
---
# handlers file for ansible-role-tripleo-collect-logs

View File

@ -1,173 +0,0 @@
galaxy_info:
author: your name
description:
company: your company (optional)
# If the issue tracker for your role is not on github, uncomment the
# next line and provide a value
# issue_tracker_url: http://example.com/issue/tracker
# Some suggested licenses:
# - BSD (default)
# - MIT
# - GPLv2
# - GPLv3
# - Apache
# - CC-BY
license: license (GPLv2, CC-BY, etc)
min_ansible_version: 1.2
# Optionally specify the branch Galaxy will use when accessing the GitHub
# repo for this role. During role install, if no tags are available,
# Galaxy will use this branch. During import Galaxy will access files on
# this branch. If travis integration is cofigured, only notification for this
# branch will be accepted. Otherwise, in all cases, the repo's default branch
# (usually master) will be used.
#github_branch:
#
# Below are all platforms currently available. Just uncomment
# the ones that apply to your role. If you don't see your
# platform on this list, let us know and we'll get it added!
#
#platforms:
#- name: EL
# versions:
# - all
# - 5
# - 6
# - 7
#- name: GenericUNIX
# versions:
# - all
# - any
#- name: Solaris
# versions:
# - all
# - 10
# - 11.0
# - 11.1
# - 11.2
# - 11.3
#- name: Fedora
# versions:
# - all
# - 16
# - 17
# - 18
# - 19
# - 20
# - 21
# - 22
# - 23
#- name: opensuse
# versions:
# - all
# - 12.1
# - 12.2
# - 12.3
# - 13.1
# - 13.2
#- name: IOS
# versions:
# - all
# - any
#- name: SmartOS
# versions:
# - all
# - any
#- name: eos
# versions:
# - all
# - Any
#- name: Windows
# versions:
# - all
# - 2012R2
#- name: Amazon
# versions:
# - all
# - 2013.03
# - 2013.09
#- name: GenericBSD
# versions:
# - all
# - any
#- name: Junos
# versions:
# - all
# - any
#- name: FreeBSD
# versions:
# - all
# - 10.0
# - 10.1
# - 10.2
# - 8.0
# - 8.1
# - 8.2
# - 8.3
# - 8.4
# - 9.0
# - 9.1
# - 9.1
# - 9.2
# - 9.3
#- name: Ubuntu
# versions:
# - all
# - lucid
# - maverick
# - natty
# - oneiric
# - precise
# - quantal
# - raring
# - saucy
# - trusty
# - utopic
# - vivid
# - wily
# - xenial
#- name: SLES
# versions:
# - all
# - 10SP3
# - 10SP4
# - 11
# - 11SP1
# - 11SP2
# - 11SP3
#- name: GenericLinux
# versions:
# - all
# - any
#- name: NXOS
# versions:
# - all
# - any
#- name: Debian
# versions:
# - all
# - etch
# - jessie
# - lenny
# - sid
# - squeeze
# - stretch
# - wheezy
galaxy_tags: []
# List tags for your role here, one per line. A tag is
# a keyword that describes and categorizes the role.
# Users find roles by searching for tags. Be sure to
# remove the '[]' above if you add tags to this list.
#
# NOTE: A tag is limited to a single word comprised of
# alphanumeric characters. Maximum 20 tags per role.
dependencies: []
# List your role dependencies here, one per line.
# Be sure to remove the '[]' above if you add dependencies
# to this list.

View File

@ -3,7 +3,7 @@
- block:
- name: Ensure required python packages are installed
pip:
requirements: "{{ local_working_dir }}/usr/local/share/ansible/roles/tripleo-collect-logs/doc-requirements.txt"
requirements: "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/doc-requirements.txt"
- name: Unarchive shell scripts
shell: >
@ -15,7 +15,7 @@
- name: Generate rST docs from scripts and move to Sphinx src dir
shell: >
awk -f "{{ local_working_dir }}/usr/local/share/ansible/roles/tripleo-collect-logs/scripts/doc_extrapolation.awk" \
awk -f "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/scripts/doc_extrapolation.awk" \
"{{ artcl_collect_dir }}/undercloud/home/stack/{{ item }}.sh" > \
"{{ artcl_docs_source_dir }}/{{ item }}.rst"
with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"

View File

@ -1,6 +1,4 @@
---
# tasks file for ansible-role-tripleo-collect-logs
- name: Collect logs
include: collect.yml
when: artcl_collect|bool

View File

@ -1,12 +1,13 @@
Welcome to |project| Documentation:
===================================
.. note:: This documentation was generated by tripleo-collect-logs_. If you
.. note:: This documentation was generated by the collect-logs_ role. If you
find any problems, please note the TripleO-Quickstart call, if available,
that was used to deploy the environment and create an issue on GitHub_.
that was used to deploy the environment and create a bug on Launchpad for
tripleo-quickstart_.
.. _tripleo-collect-logs: http://github.com/redhat-openstack/ansible-role-tripleo-collect-logs#documentation-generation-related
.. _GitHub: https://github.com/redhat-openstack/ansible-role-tripleo-collect-logs/issues
.. _collect-logs: https://github.com/openstack/tripleo-quickstart-extras/tree/master/roles/collect-logs#documentation-generation-related
.. _tripleo-quickstart: https://bugs.launchpad.net/tripleo-quickstart/+filebug
--------
Contents

View File

@ -1 +0,0 @@
localhost

View File

@ -1,5 +0,0 @@
---
- hosts: localhost
remote_user: root
roles:
- ansible-role-tripleo-collect-logs

View File

@ -1,2 +0,0 @@
---
# vars file for ansible-role-tripleo-collect-logs