diff options
| author | Dan Callaghan <dcallagh@redhat.com> | 2016-04-14 16:56:34 +1000 |
|---|---|---|
| committer | Dan Callaghan <dcallagh@redhat.com> | 2016-04-19 14:18:20 +1000 |
| commit | f9c43464775c682f4f620fee8fb32c130aadd037 (patch) | |
| tree | 5eff144e88efa112814e5c60fc65ac236b690b50 /roles/beaker | |
| parent | 9597fbb3d1650ef226ee54a4b81974da4605711b (diff) | |
| download | ansible-f9c43464775c682f4f620fee8fb32c130aadd037.tar.gz ansible-f9c43464775c682f4f620fee8fb32c130aadd037.tar.xz ansible-f9c43464775c682f4f620fee8fb32c130aadd037.zip | |
beaker/labcontroller: remove beaker-transfer handling
Previously this was trying to be smart in deciding whether to
enable/restart beaker-transfer, but there's no need. We aren't going to
need it any time soon and we can just enable it unconditionally in
future when we do need it.
Diffstat (limited to 'roles/beaker')
| -rw-r--r-- | roles/beaker/labcontroller/tasks/main.yml | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/roles/beaker/labcontroller/tasks/main.yml b/roles/beaker/labcontroller/tasks/main.yml index eb3146e2f..b5c352685 100644 --- a/roles/beaker/labcontroller/tasks/main.yml +++ b/roles/beaker/labcontroller/tasks/main.yml @@ -8,13 +8,6 @@ - beaker-lab-controller - tftp-server -- name: check beaker-transfer state - command: service beaker-transfer status - failed_when: no - changed_when: no - register: transfer_state - always_run: yes - - name: Replace default labcontroller.conf file template: src: etc/beaker/labcontroller.conf.j2 @@ -24,17 +17,12 @@ mode: 0660 backup: yes force: yes - register: configure_result notify: - reload httpd - restart beaker lab controller tags: - beaker_lab_controller -- name: restart beaker-transfer - service: name=beaker-transfer state=restarted - when: (transfer_state.rc == 0) and (configure_result.changed) - - name: enable tftp command: chkconfig tftp on tags: @@ -48,5 +36,6 @@ - beaker-proxy - beaker-provision - beaker-watchdog + # beaker-transfer is left disabled, since we have no log archive server tags: - beaker_lab_controller |