From 8703b81d7e04372eaebd3d97f11471c8bf3d0b51 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Wed, 11 Apr 2018 09:39:22 +0200 Subject: [PATCH 1/3] guess username (#23086) --- delete-tenants.yml | 3 +++ deploy-tenants.yml | 1 + group_vars/all | 2 +- install.yml | 1 + roles/facts/tasks/main.yml | 10 ++++++++++ 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 roles/facts/tasks/main.yml diff --git a/delete-tenants.yml b/delete-tenants.yml index 7bb1b6f..9b92085 100644 --- a/delete-tenants.yml +++ b/delete-tenants.yml @@ -3,6 +3,9 @@ hosts: local vars: venv_bin: "{{venv}}/bin" + roles: + - facts + tasks: - name: "delete hobo tenant" command: "{{venv_bin}}/{{apps['hobo']['project_name']}}-manage delete_tenant {{tenants_conf['dev-hobo']}}" diff --git a/deploy-tenants.yml b/deploy-tenants.yml index b12d989..4e5707b 100644 --- a/deploy-tenants.yml +++ b/deploy-tenants.yml @@ -2,6 +2,7 @@ - name: deploy publik tenants for local developement hosts: local roles: + - facts - deploy-tenants vars: venv_bin: "{{venv}}/bin" diff --git a/group_vars/all b/group_vars/all index 497bf24..57ef67e 100644 --- a/group_vars/all +++ b/group_vars/all @@ -6,7 +6,7 @@ src_dir: "/home/{{user}}/src" ssl_certificate: "/etc/ssl/certs/*.local.publik.crt" ssl_certificate_key: "/etc/ssl/private/*.local.publik.key" venv: "/home/{{user}}/envs/publik-env" -user: publik +user: your_user_name apps: authentic: db_name: authentic_multitenant diff --git a/install.yml b/install.yml index bad8276..da0316e 100644 --- a/install.yml +++ b/install.yml @@ -2,6 +2,7 @@ - name: publik multitenants installation hosts: local roles: + - facts - base - hobo - authentic diff --git a/roles/facts/tasks/main.yml b/roles/facts/tasks/main.yml new file mode 100644 index 0000000..4f4a91c --- /dev/null +++ b/roles/facts/tasks/main.yml @@ -0,0 +1,10 @@ +--- +- name: guess username (can be overidden in options/inventory) + local_action: command whoami + when: user == 'your_user_name' + register: username + +- name: set user variable + set_fact: + user: "{{ username.stdout }}" + when: user == 'your_user_name' -- 2.11.0