Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1437 Create portable host-setup document
[csit.git]
/
resources
/
tools
/
testbed-setup
/
ansible
/
roles
/
common
/
tasks
/
main.yaml
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
38d8188
..
1481536
100644
(file)
--- 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
---
# 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'
- 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 }}.+$'
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
tags: set-hostname
- name: Set sudoers admin
@@
-44,3
+52,11
@@
mode: '644'
notify: ['Update GRUB']
tags: copy-grub
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