From e971e15997aab2c9d8d1e0cf106a67ee703a3409 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 3 May 2016 19:57:55 -0500 Subject: [PATCH] Integrated updates after the multi-distro changes * Corrected the repo server log directory. This change updates the repos server log directory which was being incorrectly indexed. The old container build process would create a service log directory based on "properties". The "properties" log directory is unused or is re-defined by the various service roles. This change simply corrects the log paths which the `rsyslog_client` role uses to ensure all logs are shipped to the right places. * Add a log directory creation task to the utility container. This play incorrectly assumed that the log directory based on "properties" would be automatically created. This update simply makes that more explicit. * paramiko has been pinned to match global requirements and use a version <2. This will ressolve runtime issues in Newton with an unbound requirements. Closes-Bug: #1576755 Change-Id: I15d841106ec9a13555b9737c9388f40557f5bec5 Signed-off-by: Kevin Carter --- playbooks/repo-server.yml | 8 ++++---- playbooks/utility-install.yml | 8 ++++++++ requirements.txt | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/playbooks/repo-server.yml b/playbooks/repo-server.yml index 0f61bcc290..7b15aa9b49 100644 --- a/playbooks/repo-server.yml +++ b/playbooks/repo-server.yml @@ -59,7 +59,7 @@ - { role: "repo_server", tags: [ "repo-server" ] } - role: "rsyslog_client" rsyslog_client_log_rotate_file: repo_nginx_log_rotate - rsyslog_client_log_dir: "/var/log/nginx" + rsyslog_client_log_dir: "/var/log/{{ repo_service_user_name }}" rsyslog_client_log_files: - /var/log/rsyncd.log rsyslog_client_config_name: "99-repo-nginx-rsyslog-client.conf" @@ -67,9 +67,9 @@ - "repo-nginx-rsyslog-client" - "rsyslog-client" - role: "rsyslog_client" - rsyslog_client_log_rotate_file: repo_log_rotate - rsyslog_client_log_dir: "/var/log/repo" - rsyslog_client_config_name: "99-repo-rsyslog-client.conf" + rsyslog_client_log_rotate_file: lsyncd_log_rotate + rsyslog_client_log_dir: "/var/log/lsyncd" + rsyslog_client_config_name: "99-lsyncd-rsyslog-client.conf" tags: - "repo-rsyslog-client" - "rsyslog-client" diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml index ddaad26c6e..db7148ce59 100644 --- a/playbooks/utility-install.yml +++ b/playbooks/utility-install.yml @@ -62,6 +62,14 @@ when: is_metal | bool tags: - utility-logs + - name: Create log directory + file: + dest: "/var/log/utility" + state: "directory" + force: "yes" + when: not is_metal | bool + tags: + - utility-logs roles: - { role: "galera_client", tags: [ "utility-galera-client" ] } - { role: "pip_lock_down", tags: [ "utility-pip-lock-down" ] } diff --git a/requirements.txt b/requirements.txt index 21ce109add..b25ad0abb8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Jinja2>=2.6 # ansible netaddr>=0.7.12 # playbooks/inventory/dynamic_inventory.py -paramiko>=1.13.0 # ansible +paramiko>=1.16.0,<2 # ansible and nova PrettyTable>=0.7,<0.8 # scripts/inventory-manage.py pycrypto>=2.6 # ansible PyYAML>=3.1.0 # ansible