From 31da4f0331ddcd738ed70f34451a6c4814787833 Mon Sep 17 00:00:00 2001 From: d34dh0r53 Date: Wed, 15 Apr 2015 14:22:57 -0500 Subject: [PATCH] Adds rsyslog-client tag to install plays In order to ease the addition of external log receivers this adds an rsyslog-client tag to the installation plays. This allows us to run openstack-ansible setup-everything.yml --tags rsyslog-client to add additional logging configuration. Change-Id: If002f67a626ff5fe3dc06d77c9295ede9369b3dc Partially-Implements: blueprint master-kilofication --- playbooks/galera-install.yml | 1 + playbooks/lxc-hosts-setup.yml | 1 + playbooks/os-cinder-install.yml | 1 + playbooks/os-glance-install.yml | 1 + playbooks/os-heat-install.yml | 1 + playbooks/os-horizon-install.yml | 1 + playbooks/os-keystone-install.yml | 1 + playbooks/os-neutron-install.yml | 1 + playbooks/os-nova-install.yml | 1 + playbooks/os-swift-install.yml | 1 + playbooks/os-tempest-install.yml | 1 + playbooks/rabbitmq-install.yml | 1 + playbooks/repo-server.yml | 1 + 13 files changed, 13 insertions(+) diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index 15d91be2b7..753550e6f2 100644 --- a/playbooks/galera-install.yml +++ b/playbooks/galera-install.yml @@ -52,6 +52,7 @@ rsyslog_client_config_name: "99-galera-rsyslog-client.conf" tags: - "galera-rsyslog-client" + - "rsyslog-client" vars: galera_wsrep_node_name: "{{ container_name }}" ansible_hostname: "{{ container_name }}" diff --git a/playbooks/lxc-hosts-setup.yml b/playbooks/lxc-hosts-setup.yml index 28e8f2d862..0297aacad4 100644 --- a/playbooks/lxc-hosts-setup.yml +++ b/playbooks/lxc-hosts-setup.yml @@ -25,5 +25,6 @@ rsyslog_client_config_name: "99-lxc-rsyslog-client.conf" tags: - "lxc-rsyslog-client" + - "rsyslog-client" vars_files: - vars/repo_packages/python2_lxc.yml diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index 20dbd2fc29..c5de4ecc7d 100644 --- a/playbooks/os-cinder-install.yml +++ b/playbooks/os-cinder-install.yml @@ -96,6 +96,7 @@ rsyslog_client_config_name: "99-cinder-rsyslog-client.conf" tags: - "cinder-rsyslog-client" + - "rsyslog-client" vars: galera_address: "{{ internal_lb_vip_address }}" glance_host: "{{ internal_lb_vip_address }}" diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index daf878e8b7..f7ed212f90 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -80,6 +80,7 @@ rsyslog_client_config_name: "99-glance-rsyslog-client.conf" tags: - "glance-rsyslog-client" + - "rsyslog-client" vars: galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index d1d4c7b7d3..fa41d327e0 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -55,6 +55,7 @@ rsyslog_client_config_name: "99-heat-rsyslog-client.conf" tags: - "heat-rsyslog-client" + - "rsyslog-client" vars: galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index 8641139208..53d6622368 100644 --- a/playbooks/os-horizon-install.yml +++ b/playbooks/os-horizon-install.yml @@ -55,6 +55,7 @@ rsyslog_client_config_name: "99-horizon-rsyslog-client.conf" tags: - "horizon-rsyslog-client" + - "rsyslog-client" vars: galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index 024073930a..c34c2e5893 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -56,6 +56,7 @@ rsyslog_client_config_name: "99-keystone-rsyslog-client.conf" tags: - "keystone-rsyslog-client" + - "rsyslog-client" vars: galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index ef9d64f52f..fe3e3b03d6 100644 --- a/playbooks/os-neutron-install.yml +++ b/playbooks/os-neutron-install.yml @@ -101,6 +101,7 @@ - /var/log/conntrackd-stats.log tags: - "neutron-rsyslog-client" + - "rsyslog-client" vars: galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index ef8d3d5309..249e847ef8 100644 --- a/playbooks/os-nova-install.yml +++ b/playbooks/os-nova-install.yml @@ -97,6 +97,7 @@ rsyslog_client_config_name: "99-nova-rsyslog-client.conf" tags: - "nova-rsyslog-client" + - "rsyslog-client" vars: galera_address: "{{ internal_lb_vip_address }}" ansible_hostname: "{{ container_name }}" diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml index 88b625ed13..ed75d6536d 100644 --- a/playbooks/os-swift-install.yml +++ b/playbooks/os-swift-install.yml @@ -52,6 +52,7 @@ rsyslog_client_config_name: "99-swift-rsyslog-client.conf" tags: - "swift-rsyslog-client" + - "rsyslog-client" vars: ansible_hostname: "{{ container_name }}" ansible_ssh_host: "{{ container_address }}" diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index 3308ac8b91..3da57e2a6a 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -24,6 +24,7 @@ rsyslog_client_config_name: "99-tempest-rsyslog-client.conf" tags: - "tempest-rsyslog-client" + - "rsyslog-client" vars_files: - vars/repo_packages/openstack_services.yml vars: diff --git a/playbooks/rabbitmq-install.yml b/playbooks/rabbitmq-install.yml index 888a7f1797..902cb1640a 100644 --- a/playbooks/rabbitmq-install.yml +++ b/playbooks/rabbitmq-install.yml @@ -24,6 +24,7 @@ rsyslog_client_config_name: "99-rabbitmq-rsyslog-client.conf" tags: - "rabbitmq-rsyslog-client" + - "rsyslog-client" vars: ansible_hostname: "{{ container_name }}" ansible_ssh_host: "{{ container_address }}" diff --git a/playbooks/repo-server.yml b/playbooks/repo-server.yml index d5a52d4577..34acb6ae4a 100644 --- a/playbooks/repo-server.yml +++ b/playbooks/repo-server.yml @@ -52,6 +52,7 @@ rsyslog_client_config_name: "99-repo-rsyslog-client.conf" tags: - "repo-rsyslog-client" + - "rsyslog-client" vars: pip_no_index: false ansible_hostname: "{{ container_name }}"