Merge lp:~suligap/canonical-identity-provider/charm-drop-logfile-migration-tasks into lp:~ubuntuone-pqm-team/canonical-identity-provider/charm

Proposed by Przemysław Suliga
Status: Merged
Approved by: Simon Davy
Approved revision: 94
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~suligap/canonical-identity-provider/charm-drop-logfile-migration-tasks
Merge into: lp:~ubuntuone-pqm-team/canonical-identity-provider/charm
Diff against target: 43 lines (+0/-26)
1 file modified
playbook.yaml (+0/-26)
To merge this branch: bzr merge lp:~suligap/canonical-identity-provider/charm-drop-logfile-migration-tasks
Reviewer Review Type Date Requested Status
Simon Davy (community) Approve
Review via email: mp+384723@code.launchpad.net

Commit message

Drop no longer needed temporary tasks for logfiles migration

Not needed anymore as per comments in
https://code.launchpad.net/~roadmr/canonical-identity-provider/charm-fix-talisker-logfile-migration/+merge/384659

To post a comment you must log in.
Revision history for this message
Simon Davy (bloodearnest) :
review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'playbook.yaml'
2--- playbook.yaml 2020-05-25 15:57:19 +0000
3+++ playbook.yaml 2020-05-28 12:03:30 +0000
4@@ -12,7 +12,6 @@
5 python: "{{ venv }}/bin/python"
6 wheel_dir: "{{ current_dir }}/branches/wheels"
7 logs_dir: "{{ basedir }}/logs"
8- sso_log: "{{ logs_dir }}/sso.log"
9 oops_dir: "{{ basedir }}/logs/www-oops"
10 conf_dir: "{{ basedir }}/etc"
11 run_dir: "{{ basedir }}/run"
12@@ -144,31 +143,6 @@
13 group: "{{ user }}"
14 state: "{% if readonly %}touch{% else %}absent{% endif %}"
15
16- # temporary task to handle migration to talisker logging
17- - name: test for linked logfile
18- tags:
19- - config-changed
20- stat: path={{ sso_log }}
21- register: log_file
22- when: talisker.stat.exists
23-
24- # temporary task to handle migration to talisker logging
25- - name: mv old log file
26- tags:
27- - config-changed
28- command: mv {{ sso_log }} {{ sso_log }}.bak
29- when: talisker.stat.exists and not log_file.stat.islnk
30-
31- - name: link log file
32- tags:
33- - config-changed
34- file:
35- path: "{{ logs_dir }}/sso.log"
36- src: /var/log/upstart/gunicorn.log
37- state: link
38- # temporary when until migrated to talisker
39- when: talisker.stat.exists
40-
41 # the next 2 tasks should really only run when the payload has *changed*
42 - name: Install required sso packages
43 tags:

Subscribers

People subscribed via source and target branches