From a8021f67425f7d2aaebe659e45c0efa976db5e0a Mon Sep 17 00:00:00 2001 From: sankar palanivel Date: Thu, 11 Nov 2021 15:47:08 +0000 Subject: [PATCH] Update ansible variables to keep it generic Change-Id: Ibb0f35d7c4d9e823c590c8aed1dcd8833242c877 --- .../tasks/configure-jumphost.yaml | 2 +- .../roles/configure-admin-user-access/vars/main.yaml | 4 ++-- .../roles/configure-k8s-admin-config/vars/main.yaml | 2 +- .../inventory/group_vars/all/common_vars.yaml | 6 +++--- .../inventory/group_vars/all/common_vars.yaml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/tasks/configure-jumphost.yaml b/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/tasks/configure-jumphost.yaml index c21516f..1444843 100644 --- a/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/tasks/configure-jumphost.yaml +++ b/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/tasks/configure-jumphost.yaml @@ -49,7 +49,7 @@ group: "{{ admin_user }}" mode: 0600 with_items: - - "{{ lookup('file', '{{ nolabs_user_public_key }}') }}" + - "{{ lookup('file', '{{ target_user_public_key }}') }}" - "{{ lookup('file', '{{ slave_user_public_key }}') }}" - name: Create SSH keypair for '{{ admin_user }}' diff --git a/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/vars/main.yaml b/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/vars/main.yaml index 5cd1d26..05150ef 100644 --- a/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/vars/main.yaml +++ b/infra/configure_admin_user_access/playbooks/roles/configure-admin-user-access/vars/main.yaml @@ -20,10 +20,10 @@ # ------------------------------------------------------------------------------- # Admin User Setup # ------------------------------------------------------------------------------- -admin_user: 'nordix' +admin_user: "{{ lookup('env','admin_user') }}" admin_user_ssh_dir: "/home/{{ admin_user }}/.ssh" admin_user_private_key: "/home/{{ admin_user }}/.ssh/id_rsa" admin_user_public_key: "/home/{{ admin_user }}/.ssh/id_rsa.pub" admin_user_jumphost_public_key: "/tmp/{{ admin_user }}_id_rsa.pub" -nolabs_user_public_key: "/tmp/nolabs/id_rsa.pub" +target_user_public_key: "/tmp/{{ lookup('env','target_user') }}/id_rsa.pub" slave_user_public_key: "/home/jenkins/.ssh/id_rsa.pub" \ No newline at end of file diff --git a/infra/configure_k8s_admin_config/playbooks/roles/configure-k8s-admin-config/vars/main.yaml b/infra/configure_k8s_admin_config/playbooks/roles/configure-k8s-admin-config/vars/main.yaml index fe4b2ba..fc2576d 100644 --- a/infra/configure_k8s_admin_config/playbooks/roles/configure-k8s-admin-config/vars/main.yaml +++ b/infra/configure_k8s_admin_config/playbooks/roles/configure-k8s-admin-config/vars/main.yaml @@ -37,5 +37,5 @@ helm_client_download_url: "https://get.helm.sh/helm-{{ helm_version }}-linux-amd # Setup k8s admin config # ------------------------------------------------------------------------------- k8s_admin_conf: "/tmp/admin.conf" -admin_user: 'nordix' +admin_user: "{{ lookup('env','admin_user') }}" admin_user_kube_dir: "/home/{{ admin_user }}/.kube" \ No newline at end of file diff --git a/infra/configure_openvpn_client/inventory/group_vars/all/common_vars.yaml b/infra/configure_openvpn_client/inventory/group_vars/all/common_vars.yaml index 4d720cc..62ec6b9 100644 --- a/infra/configure_openvpn_client/inventory/group_vars/all/common_vars.yaml +++ b/infra/configure_openvpn_client/inventory/group_vars/all/common_vars.yaml @@ -9,9 +9,9 @@ openvpn_server: "openvpn-server-{{ lookup('env','BOOKING_ID') }}" country: BE province: BRUSSELS city: BRUSSELS -org: Nordix -orgunit: Nolabs -email: infra@nordix.org +org: "{{ lookup('env','org') }}" +orgunit: "{{ lookup('env','orgunit') }}" +email: "{{ lookup('env','email') }}" # user specific vars user_name: "{{ lookup('env','user_name') }}" \ No newline at end of file diff --git a/infra/configure_openvpn_server/inventory/group_vars/all/common_vars.yaml b/infra/configure_openvpn_server/inventory/group_vars/all/common_vars.yaml index a23b311..1ad0c54 100644 --- a/infra/configure_openvpn_server/inventory/group_vars/all/common_vars.yaml +++ b/infra/configure_openvpn_server/inventory/group_vars/all/common_vars.yaml @@ -9,6 +9,6 @@ openvpn_server: "openvpn-server-{{ lookup('env','BOOKING_ID') }}" country: BE province: BRUSSELS city: BRUSSELS -org: Nordix -orgunit: Nolabs -email: infra@nordix.org \ No newline at end of file +org: "{{ lookup('env','org') }}" +orgunit: "{{ lookup('env','orgunit') }}" +email: "{{ lookup('env','email') }}" \ No newline at end of file -- 2.25.1