Skip to content
Snippets Groups Projects
Unverified Commit ca6da350 authored by Erik-jan Riemers's avatar Erik-jan Riemers Committed by GitHub
Browse files

Merge pull request #9 from markv/cleanup

Clean up scripts
parents 40fd0033 2f789b07
No related branches found
No related tags found
No related merge requests found
...@@ -19,4 +19,15 @@ gitlab_runner_docker_image: '' ...@@ -19,4 +19,15 @@ gitlab_runner_docker_image: ''
gitlab_runner_tags: [] gitlab_runner_tags: []
# Docker privileged mode # Docker privileged mode
gitlab_runner_docker_privileged: false gitlab_runner_docker_privileged: false
# Runner SSH user
gitlab_runner_ssh_user: ''
# Runner SSH host
gitlab_runner_ssh_host: ''
# Runner SSH port
gitlab_runner_ssh_port: ''
# Runner SSH password
gitlab_runner_ssh_password: ''
# Runner SSH identity file
gitlab_runner_ssh_identity_file: ''
# Runner Locked
gitlab_runner_locked: 'false'
\ No newline at end of file
--- ---
- name: restart_gitlab_runner - name: restart_gitlab_runner
service: name=gitlab-runner state=restarted service: name=gitlab-runner state=restarted
become: yes
--- ---
- name: Install GitLab Runner (Debian) - name: Install GitLab Runner (Debian)
include: install-debian.yml import_tasks: install-debian.yml
when: ansible_os_family == 'Debian' when: ansible_os_family == 'Debian'
- name: Install GitLab Runner (RedHat) - name: Install GitLab Runner (RedHat)
include: install-redhat.yml import_tasks: install-redhat.yml
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'
- name: Set global options - name: Set global options
include: global-setup.yml import_tasks: global-setup.yml
- name: Register GitLab Runner - name: Register GitLab Runner
include: register-runner.yml import_tasks: register-runner.yml
when: gitlab_runner_registration_token != '' when: gitlab_runner_registration_token != ''
...@@ -12,11 +12,14 @@ ...@@ -12,11 +12,14 @@
--description '{{ gitlab_runner_description }}' --description '{{ gitlab_runner_description }}'
--tag-list '{{ gitlab_runner_tags | join(",") }}' --tag-list '{{ gitlab_runner_tags | join(",") }}'
--executor '{{ gitlab_runner_executor }}' --executor '{{ gitlab_runner_executor }}'
--locked='{{gitlab_runner_locked}}'
--docker-image '{{ gitlab_runner_docker_image }}' --docker-image '{{ gitlab_runner_docker_image }}'
--docker-volumes [ "{{ gitlab_runner_docker_volumes | join('", "') }}" ] {% if gitlab_runner_docker_volumes is defined %}
--ssh-user '{{gitlab_runner_ssh_user}}' --docker-volumes "{{ gitlab_runner_docker_volumes | join('" "') }}"
--ssh-host '{{gitlab_runner_ssh_host}}' {% endif %}
--ssh-port '{{gitlab_runner_ssh_port}}' --ssh-user '{{ gitlab_runner_ssh_user }}'
--ssh-password '{{gitlab_runner_ssh_password}}' --ssh-host '{{ gitlab_runner_ssh_host }}'
--ssh-identity-file '{{gitlab_runner_ssh_identity_file}}' --ssh-port '{{ gitlab_runner_ssh_port }}'
when: configured_runners.stderr.find('\n{{ gitlab_runner_description }}') == -1 --ssh-password '{{ gitlab_runner_ssh_password }}'
--ssh-identity-file '{{ gitlab_runner_ssh_identity_file }}'
when: configured_runners.stderr.find('\n' + gitlab_runner_description) == -1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment