X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Fcommon%2Ftasks%2Fmain.yaml;h=14815360341b255d1ed6a076e3a3844cc1555edb;hp=38d8188be810ccaea9b9ee196e38fcdd1fbc290d;hb=53153e114017d193cdf9b88f21f4eac31bad72b7;hpb=138c1b1f56a2b59afeafb92379e955b9baf95e7a

diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
index 38d8188be8..1481536034 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
@@ -1,6 +1,14 @@
 ---
 # file: roles/common/tasks/main.yaml
 
+- name: Add permanent proxy settings
+  lineinfile:
+    path: "/etc/environment"
+    state: "present"
+    line: "{{ item.key }}={{ item.value }}"
+  with_dict: "{{ proxy_env }}"
+  when: proxy_env is defined
+
 - name: Ubuntu specific
   import_tasks: ubuntu.yaml
   when: ansible_distribution|lower == 'ubuntu'
@@ -14,7 +22,7 @@
   lineinfile:
     path: '/etc/hosts'
     regexp: '^{{ ansible_default_ipv4.address }}.+$'
-    line: '{{ ansible_default_ipv4.address }} {{ hostname }}.linuxfoundation.org'
+    line: '{{ ansible_default_ipv4.address }} {{ hostname }}.{{ domain }}'
   tags: set-hostname
 
 - name: Set sudoers admin
@@ -44,3 +52,11 @@
    mode: '644'
   notify: ['Update GRUB']
   tags: copy-grub
+
+- name: Add permanent proxy settings
+  lineinfile:
+    path: "/etc/environment"
+    state: "present"
+    line: "{{ item.key }}={{ item.value }}"
+  with_dict: "{{ proxy_env }}"
+  when: proxy_env is defined