4 files changed, 73 insertions, 9 deletions
diff --git a/benchmarks/playbooks/dhrystone.yaml b/benchmarks/playbooks/dhrystone.yaml
index 3ea04382..eb46ad08 100644
--- a/benchmarks/playbooks/dhrystone.yaml
+++ b/benchmarks/playbooks/dhrystone.yaml
@@ -26,6 +26,7 @@
     - include: ./sys_info_pbook.yaml
       vars:
           network: false
+    - include: ./sys_proxy_pbook.yaml
 
     - name: Installing UnixBench dependencies if CentOS
       shell: sudo yum install git gcc  patch perl-Time-HiRes -y
@@ -35,6 +36,8 @@
       shell: sudo apt-get install git gcc  patch perl -y
       when: ansible_os_family == "Debian"
 
+    - include: ./git_proxy_pbook.yaml
+
     - name: Clone unixbench
       shell: git clone https://github.com/kdlucas/byte-unixbench.git $HOME/tempT
 
diff --git a/benchmarks/playbooks/git_proxy_pbook.yaml b/benchmarks/playbooks/git_proxy_pbook.yaml
new file mode 100644
index 00000000..6d155a76
--- /dev/null
+++ b/benchmarks/playbooks/git_proxy_pbook.yaml
@@ -0,0 +1,12 @@
+
+#git
+- name: set git proxy(http)
+  shell: "git config --global http.proxy {{ http_proxy }}"
+  when: http_proxy is defined
+  ignore_errors: yes
+
+- name: set git proxy(https)
+  shell: "git config --global https.proxy {{https_proxy}}"
+  when: https_proxy is defined
+  ignore_errors: yes
+
diff --git a/benchmarks/playbooks/iperf.yaml b/benchmarks/playbooks/iperf.yaml
index 4199b621..a6e3775b 100644
--- a/benchmarks/playbooks/iperf.yaml
+++ b/benchmarks/playbooks/iperf.yaml
@@ -55,16 +55,12 @@
       shell: sudo yum install epel-release -y
       when: ansible_os_family == "RedHat"
 
-    - name: Getting Firewall entry number
-      shell: sudo iptables -L INPUT --line-number | grep DROP | awk '{print $1}'
-      register: iptable_entry
-      ignore_errors: yes
-      when: installertype == 'fuel'
-
-    - name: Removing entry number
-      shell: sudo iptables -D INPUT {{iptable_entry.stdout}}
+    - name: Allow iperf server port in iptables input rules
+      shell: iptables -A INPUT -p tcp --dport {{iperf_port}} -j ACCEPT
+      vars:
+        iperf_port: 5201
       ignore_errors: yes
-      when: iptable_entry != '' and installertype == 'fuel'
+      when: rolename == "1-server" and installertype == 'fuel'
 
     - name: Installing IPERF when Ubuntu
       shell: sudo apt-get install iperf3 -y
diff --git a/benchmarks/playbooks/sys_proxy_pbook.yaml b/benchmarks/playbooks/sys_proxy_pbook.yaml
new file mode 100644
index 00000000..bf4a8ccb
--- /dev/null
+++ b/benchmarks/playbooks/sys_proxy_pbook.yaml
@@ -0,0 +1,53 @@
+#env
+- name: insert shell proxy http
+  lineinfile: dest=/etc/profile.d/proxy.sh state=present create=yes owner=root group=root mode=0644 regexp="export http_proxy={{ http_proxy }}"
+              insertafter=EOF line="export http_proxy={{ http_proxy }}"
+  when: http_proxy is defined
+  ignore_errors: yes
+
+- name: insert shell proxy https
+  lineinfile: dest=/etc/profile.d/proxy.sh state=present create=yes owner=root group=root mode=0644 regexp="export https_proxy={{ https_proxy }}"
+              insertafter=EOF line="export https_proxy={{ https_proxy }}"
+  when: https_proxy is defined
+  ignore_errors: yes
+
+- name: insert no proxy
+  lineinfile: dest=/etc/profile.d/proxy.sh state=present create=yes owner=root group=root mode=0644 regexp="{{ no_proxy }}"
+              insertafter=EOF line="export no_proxy={{ no_proxy }}"
+  when: no_proxy is defined
+  ignore_errors: yes
+
+#wget
+- name: insert wget proxy(http)
+  lineinfile: dest=/etc/wgetrc state=present regexp="http_proxy={{ http_proxy }}"
+              insertafter="^#http_proxy" line="http_proxy={{ http_proxy }}"
+  when: http_proxy is defined
+  ignore_errors: yes
+
+- name: insert wget proxy(https)
+  lineinfile: dest=/etc/wgetrc state=present regexp="https_proxy={{ https_proxy }}"
+              insertafter="^#https_proxy" line="https_proxy={{ https_proxy }}"
+  when: https_proxy is defined
+  ignore_errors: yes
+
+#yum
+- name: insert yum proxy(http)
+  lineinfile: dest=/etc/yum.conf state=present regexp="proxy={{ http_proxy }}"
+               insertafter=EOF line="proxy={{ http_proxy }}"
+  when: ansible_os_family == "RedHat" and http_proxy is defined
+  ignore_errors: yes
+
+#apt
+
+- name: insert apt proxy(http)
+  lineinfile: dest=/etc/apt/apt.conf state=present create=yes regexp="Acquire::http::Proxy \"{{ http_proxy }}\";"
+              insertafter=EOF line="Acquire::http::Proxy \"{{ http_proxy }}\";"
+  when: ansible_os_family == "Debian" and http_proxy is defined
+  ignore_errors: yes
+
+- name: insert apt proxy(https)
+  lineinfile: dest=/etc/apt/apt.conf state=present create=yes regexp="Acquire::https::Proxy \"{{ https_proxy }}\";"
+              insertafter=EOF line="Acquire::https::Proxy \"{{ https_proxy }}\";"
+  when: ansible_os_family == "Debian" and https_proxy is defined
+  ignore_errors: yes
+