From c58e4852c0cdfd51309a076c9a3048f447697a3a Mon Sep 17 00:00:00 2001
From: Pi <pi@sdwan.comcast.com>
Date: Mon, 18 Mar 2019 16:18:59 -0400
Subject: [PATCH] -consolidate sipp -add clean_hosts

---
 hosts                                              | 14 ++++++++++++++
 main.yaml                                          |  2 +-
 roles/common/tasks/main.yaml                       | 12 ++++++++++++
 roles/netflows/tasks/main.yaml                     |  2 +-
 roles/{sipclient => sipp}/files/startclient.sh     |  0
 .../files/start.sh => sipp/files/startserver.sh}   |  0
 roles/{sipclient => sipp}/tasks/main.yaml          | 13 +++++++++++++
 7 files changed, 41 insertions(+), 2 deletions(-)
 rename roles/{sipclient => sipp}/files/startclient.sh (100%)
 rename roles/{sipserver/files/start.sh => sipp/files/startserver.sh} (100%)
 rename roles/{sipclient => sipp}/tasks/main.yaml (67%)

diff --git a/hosts b/hosts
index c0274c7..127f7b5 100755
--- a/hosts
+++ b/hosts
@@ -1,4 +1,5 @@
 sdwcltm2	ansible_host=192.168.50.2
+sdwcltm3	ansible_host=192.168.201.55
 sdwcltm5	ansible_host=192.168.35.1
 sdwsrvm		ansible_host=192.168.60.2
 sdwcltm8 	ansible_host=192.168.150.2
@@ -13,6 +14,7 @@ sdwcltm9	ansible_host=192.168.200.163 ansible_user=ubuntu
 
 [pi]
 sdwcltm2
+sdwcltm3
 sdwcltm5
 sdwsrvm
 sdwcltm8
@@ -24,6 +26,7 @@ sdwcltm4
 
 [smbclient]
 sdwcltm2
+sdwcltm3
 ubuntu-server-1
 sdwcltm5
 sdwsrvm
@@ -40,11 +43,13 @@ ubuntu-server-1
 [snmpd]
 #192.168.201.3
 sdwcltm2
+sdwcltm3
 sdwcltm6
 sdwcltm8
 
 [netflows]
 sdwcltm2
+sdwcltm3
 sdwcltm5
 sdwcltm6
 sdwcltm7
@@ -54,11 +59,13 @@ sdwsrvm
 sdwsrvl
 
 [facebook]
+sdwcltm3
 sdwcltm5
 sdwsrvm
 sdwcltm4
 
 [salesforce]
+sdwcltm3
 sdwcltm6
 sdwcltm7
 sdwsrvl
@@ -66,9 +73,11 @@ sdwcltm8
 
 [youtube]
 sdwcltm2
+sdwcltm3
 
 [ftpclient]
 sdwcltm2
+sdwcltm3
 sdwcltm4
 sdwcltm5
 sdwcltm6
@@ -78,4 +87,9 @@ sdwsrvm
 ubuntu-server-1
 
 [sipclient]
+sdwcltm2
+sdwcltm3
 sdwcltm6
+
+[sipserver]
+sdwcltm3
diff --git a/main.yaml b/main.yaml
index e7eb433..37d2bb8 100644
--- a/main.yaml
+++ b/main.yaml
@@ -38,4 +38,4 @@
           - nrpe
 - hosts: sipclient
   roles:
-          - sipclient
+          - sipp
diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml
index f7cf332..4e843b7 100755
--- a/roles/common/tasks/main.yaml
+++ b/roles/common/tasks/main.yaml
@@ -23,6 +23,13 @@
           content: "{{ lookup('template', '{{ role_path }}/templates/hosts.j2') }}"
           state: present
   tags: update_hosts
+- name: clean hosts file
+  become: true
+  blockinfile:
+          path: /etc/hosts
+          marker: "# {mark} ANSIBLE MANAGED BLOCK"
+          content: ""
+  tags: clean_hosts
 - name: install programs and libraries
   become: true
   apt:
@@ -30,3 +37,8 @@
           update_cache: true
           state: present
   tags: install_packages
+- name: set hostname
+  become: true
+  hostname:
+    name: '{{ inventory_hostname }}'
+  tags: set_hostname
diff --git a/roles/netflows/tasks/main.yaml b/roles/netflows/tasks/main.yaml
index 169b45a..900d60d 100755
--- a/roles/netflows/tasks/main.yaml
+++ b/roles/netflows/tasks/main.yaml
@@ -11,7 +11,7 @@
     state: present
     backrefs: yes
     regexp: '^FLOW_COLLECTOR='
-    line: 'FLOW_COLLECTOR="192.168.201.53:9996"'
+    line: 'FLOW_COLLECTOR="192.168.201.11:2055"'
   become: true
   tags: configure_fprobe
 - name: enable fprobe service and ensure it is not masked
diff --git a/roles/sipclient/files/startclient.sh b/roles/sipp/files/startclient.sh
similarity index 100%
rename from roles/sipclient/files/startclient.sh
rename to roles/sipp/files/startclient.sh
diff --git a/roles/sipserver/files/start.sh b/roles/sipp/files/startserver.sh
similarity index 100%
rename from roles/sipserver/files/start.sh
rename to roles/sipp/files/startserver.sh
diff --git a/roles/sipclient/tasks/main.yaml b/roles/sipp/tasks/main.yaml
similarity index 67%
rename from roles/sipclient/tasks/main.yaml
rename to roles/sipp/tasks/main.yaml
index 89410f5..ab7ba7c 100755
--- a/roles/sipclient/tasks/main.yaml
+++ b/roles/sipp/tasks/main.yaml
@@ -31,3 +31,16 @@
   args:
           chdir: "/home/pi/sipp"
   tags: sipp
+- name: copy scripts
+  when: sipp_move_directory is changed
+  copy:
+          src: "{{ item.src }}"
+          dest: "{{ item.dest }}"
+          owner: pi
+          group: pi
+          mode: a+x
+  with_items:
+          - { src: "{{ role_path }}/files/startserver.sh", dest: "/home/pi/sipp/startserver.sh" }
+          - { src: "{{ role_path }}/files/startclient.sh", dest: "/home/pi/sipp/startclient.sh" }
+  tags: sipp
+