cleanup
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Robert Kaussow 2019-11-24 17:29:04 +01:00
parent ce4d073da2
commit 3059ed92fb
5 changed files with 14 additions and 34 deletions

View File

@ -1,4 +1,2 @@
---
- import_tasks: prepare.yml
- import_tasks: setup.yml
- import_tasks: post.yml
- include_tasks: setup.yml

View File

@ -1,10 +0,0 @@
---
- block:
- name: Ensure drone service is up and running
systemd:
state: started
daemon_reload: yes
enabled: yes
name: drone
become: True
become_user: root

View File

@ -1,16 +0,0 @@
---
- block:
- name: Ensure service directory exists
file:
path: "{{ droneci_service_directory }}"
state: directory
mode: 0755
- name: Install required dependencies
pip:
name: "{{ item.name }}"
executable: "{{ item.exec | default(omit) }}"
state: present
loop: "{{ __drone_pip_dependencies }}"
become: True
become_user: root

View File

@ -4,6 +4,12 @@
droneci_no_proxy: "{{ __droneci_default_no_proxy }} + {{ droneci_no_proxy | default([]) }}"
- block:
- name: Ensure service directory exists
file:
path: "{{ droneci_service_directory }}"
state: directory
mode: 0755
- name: Deploy compose file to '{{ droneci_service_directory }}'
template:
src: "services/droneci-compose.yml.j2"
@ -26,5 +32,12 @@
dest: "{{ droneci_service_directory }}/{{ droneci_license_key | basename }}"
mode: 0600
when: droneci_license_key is defined
- name: Ensure drone service is up and running
systemd:
state: started
daemon_reload: yes
enabled: yes
name: drone
become: True
become_user: root

View File

@ -2,8 +2,3 @@
__droneci_default_no_proxy:
- droneserver
- droneagent
__drone_pip_dependencies:
- name: docker
- name: docker-compose
exec: pip3