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
=== modified file 'playbook.yaml'
--- playbook.yaml 2020-05-25 15:57:19 +0000
+++ playbook.yaml 2020-05-28 12:03:30 +0000
@@ -12,7 +12,6 @@
12 python: "{{ venv }}/bin/python"12 python: "{{ venv }}/bin/python"
13 wheel_dir: "{{ current_dir }}/branches/wheels"13 wheel_dir: "{{ current_dir }}/branches/wheels"
14 logs_dir: "{{ basedir }}/logs"14 logs_dir: "{{ basedir }}/logs"
15 sso_log: "{{ logs_dir }}/sso.log"
16 oops_dir: "{{ basedir }}/logs/www-oops"15 oops_dir: "{{ basedir }}/logs/www-oops"
17 conf_dir: "{{ basedir }}/etc"16 conf_dir: "{{ basedir }}/etc"
18 run_dir: "{{ basedir }}/run"17 run_dir: "{{ basedir }}/run"
@@ -144,31 +143,6 @@
144 group: "{{ user }}"143 group: "{{ user }}"
145 state: "{% if readonly %}touch{% else %}absent{% endif %}"144 state: "{% if readonly %}touch{% else %}absent{% endif %}"
146145
147 # temporary task to handle migration to talisker logging
148 - name: test for linked logfile
149 tags:
150 - config-changed
151 stat: path={{ sso_log }}
152 register: log_file
153 when: talisker.stat.exists
154
155 # temporary task to handle migration to talisker logging
156 - name: mv old log file
157 tags:
158 - config-changed
159 command: mv {{ sso_log }} {{ sso_log }}.bak
160 when: talisker.stat.exists and not log_file.stat.islnk
161
162 - name: link log file
163 tags:
164 - config-changed
165 file:
166 path: "{{ logs_dir }}/sso.log"
167 src: /var/log/upstart/gunicorn.log
168 state: link
169 # temporary when until migrated to talisker
170 when: talisker.stat.exists
171
172 # the next 2 tasks should really only run when the payload has *changed*146 # the next 2 tasks should really only run when the payload has *changed*
173 - name: Install required sso packages147 - name: Install required sso packages
174 tags:148 tags:

Subscribers

People subscribed via source and target branches