Update ansible variables to keep it generic

Change-Id: Ibb0f35d7c4d9e823c590c8aed1dcd8833242c877

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 c21516f7c7593abf513922f7825c0e7574952534..1444843749c0245c194281181d7073445c6f4afa 100644 (file)
--- 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 5cd1d264927989d967a89843409392a530e9aa6e..05150ef4cc1f16cac9de30aeb6949d90c885f127 100644 (file)
--- 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 fe4b2ba59e912911c28abf610230da8ac11d6579..fc2576df7c991977ac3152f3f6173a9e78fb7296 100644 (file)
--- 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 4d720ccf2d97048ae52ae0bf6256264fccb62ae0..62ec6b9ba50a65ba1c07d4b817d5d7786c50e218 100644 (file)
--- 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 a23b311e4ad60665576e6413a5f2a10a6142e25d..1ad0c54e0a7e69ef9a9ca43b4485b485756eb109 100644 (file)
--- 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