From 831a4962c15ae85e2026bd587e1509d9053e45cf Mon Sep 17 00:00:00 2001 From: "Regis A. Despres" Date: Thu, 16 Jul 2020 09:41:09 +0200 Subject: [PATCH] gitlab_runners inventory plugin: runtime en var and list default behavior (#611) * chore: runtime en var and list default bahevaior Ability to pick options values from env vars on gitlab_runners inventory plugin Remove default 20 items limit to runners list on gitlab_runners inventory plugin * Changelog fragment Co-authored-by: Felix Fontein * Changelog fragment * Badly placed fragment Co-authored-by: Felix Fontein * changelog fragment for api token * changelog fragment * Update changelogs/fragments/611-gitlab-runners-env-vars-intput-and-default-item-limit.yaml Co-authored-by: Felix Fontein * Update changelogs/fragments/611-gitlab-runners-env-vars-intput-and-default-item-limit.yaml Co-authored-by: Andrew Klychkov * fix: remove default filter all due to #440 * fix: remove default filter all due to #440 * chore: add os env var for filter input * chore: add os env var for filter input Co-authored-by: Felix Fontein Co-authored-by: Andrew Klychkov --- ...b-runners-env-vars-intput-and-default-item-limit.yaml | 2 ++ plugins/inventory/gitlab_runners.py | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 changelogs/fragments/611-gitlab-runners-env-vars-intput-and-default-item-limit.yaml diff --git a/changelogs/fragments/611-gitlab-runners-env-vars-intput-and-default-item-limit.yaml b/changelogs/fragments/611-gitlab-runners-env-vars-intput-and-default-item-limit.yaml new file mode 100644 index 0000000000..de40435454 --- /dev/null +++ b/changelogs/fragments/611-gitlab-runners-env-vars-intput-and-default-item-limit.yaml @@ -0,0 +1,2 @@ +minor_changes: + - gitlab_runners inventory plugin - permit environment variable input for ``server_url``, ``api_token`` and ``filter`` options (https://github.com/ansible-collections/community.general/pull/611). diff --git a/plugins/inventory/gitlab_runners.py b/plugins/inventory/gitlab_runners.py index 13861bf62e..d46ec60e09 100644 --- a/plugins/inventory/gitlab_runners.py +++ b/plugins/inventory/gitlab_runners.py @@ -30,17 +30,26 @@ DOCUMENTATION = ''' - gitlab_runners server_url: description: The URL of the GitLab server, with protocol (i.e. http or https). + env: + - name: GITLAB_SERVER_URL + version_added: 1.0.0 type: str required: true default: https://gitlab.com api_token: description: GitLab token for logging in. + env: + - name: GITLAB_API_TOKEN + version_added: 1.0.0 type: str aliases: - private_token - access_token filter: description: filter runners from GitLab API + env: + - name: GITLAB_FILTER + version_added: 1.0.0 type: str choices: ['active', 'paused', 'online', 'specific', 'shared'] verbose_output: