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 <kevin.carter@rackspace.com>
This commit is contained in:
parent
afc9ec9815
commit
e971e15997
@ -59,7 +59,7 @@
|
|||||||
- { role: "repo_server", tags: [ "repo-server" ] }
|
- { role: "repo_server", tags: [ "repo-server" ] }
|
||||||
- role: "rsyslog_client"
|
- role: "rsyslog_client"
|
||||||
rsyslog_client_log_rotate_file: repo_nginx_log_rotate
|
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:
|
rsyslog_client_log_files:
|
||||||
- /var/log/rsyncd.log
|
- /var/log/rsyncd.log
|
||||||
rsyslog_client_config_name: "99-repo-nginx-rsyslog-client.conf"
|
rsyslog_client_config_name: "99-repo-nginx-rsyslog-client.conf"
|
||||||
@ -67,9 +67,9 @@
|
|||||||
- "repo-nginx-rsyslog-client"
|
- "repo-nginx-rsyslog-client"
|
||||||
- "rsyslog-client"
|
- "rsyslog-client"
|
||||||
- role: "rsyslog_client"
|
- role: "rsyslog_client"
|
||||||
rsyslog_client_log_rotate_file: repo_log_rotate
|
rsyslog_client_log_rotate_file: lsyncd_log_rotate
|
||||||
rsyslog_client_log_dir: "/var/log/repo"
|
rsyslog_client_log_dir: "/var/log/lsyncd"
|
||||||
rsyslog_client_config_name: "99-repo-rsyslog-client.conf"
|
rsyslog_client_config_name: "99-lsyncd-rsyslog-client.conf"
|
||||||
tags:
|
tags:
|
||||||
- "repo-rsyslog-client"
|
- "repo-rsyslog-client"
|
||||||
- "rsyslog-client"
|
- "rsyslog-client"
|
||||||
|
@ -62,6 +62,14 @@
|
|||||||
when: is_metal | bool
|
when: is_metal | bool
|
||||||
tags:
|
tags:
|
||||||
- utility-logs
|
- utility-logs
|
||||||
|
- name: Create log directory
|
||||||
|
file:
|
||||||
|
dest: "/var/log/utility"
|
||||||
|
state: "directory"
|
||||||
|
force: "yes"
|
||||||
|
when: not is_metal | bool
|
||||||
|
tags:
|
||||||
|
- utility-logs
|
||||||
roles:
|
roles:
|
||||||
- { role: "galera_client", tags: [ "utility-galera-client" ] }
|
- { role: "galera_client", tags: [ "utility-galera-client" ] }
|
||||||
- { role: "pip_lock_down", tags: [ "utility-pip-lock-down" ] }
|
- { role: "pip_lock_down", tags: [ "utility-pip-lock-down" ] }
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Jinja2>=2.6 # ansible
|
Jinja2>=2.6 # ansible
|
||||||
netaddr>=0.7.12 # playbooks/inventory/dynamic_inventory.py
|
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
|
PrettyTable>=0.7,<0.8 # scripts/inventory-manage.py
|
||||||
pycrypto>=2.6 # ansible
|
pycrypto>=2.6 # ansible
|
||||||
PyYAML>=3.1.0 # ansible
|
PyYAML>=3.1.0 # ansible
|
||||||
|
Loading…
Reference in New Issue
Block a user