From 0cf1fb01836346b196296ae8f4b2484993124bc5 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Wed, 17 Jun 2020 07:46:06 +0200
Subject: Add ipepdvarchive

---
 install.yml                      | 2 +-
 inventories/ipe.erb              | 6 ++++++
 roles/ands_storage/tasks/nfs.yml | 9 ++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/install.yml b/install.yml
index e675815..da0a235 100644
--- a/install.yml
+++ b/install.yml
@@ -60,7 +60,7 @@
     - role: ands_scripts
 
 - name: Docker Containers (Pods)
-  hosts: all
+  hosts: docker
   remote_user: root
   roles:
     - role: ands_pods
diff --git a/inventories/ipe.erb b/inventories/ipe.erb
index 1041e21..3b7c0c8 100644
--- a/inventories/ipe.erb
+++ b/inventories/ipe.erb
@@ -1,6 +1,9 @@
 [ands]
 192.168.26.[140:149]
 
+[server]
+192.168.26.[170:179]
+
 [compute]
 192.168.26.[130:139]
 
@@ -29,11 +32,13 @@ student
 192.168.26.[80:89]
 192.168.26.[130:139]
 192.168.26.[140:149]
+192.168.26.[170:171]
 
 [infra]
 192.168.26.[80:89]
 192.168.26.[130:139]
 192.168.26.[140:149]
+192.168.26.[170:171]
 
 [vm]
 192.168.26.216
@@ -41,6 +46,7 @@ student
 [ipaclients:children]
 vm
 compute
+server
 
 [devel:children]
 compute
diff --git a/roles/ands_storage/tasks/nfs.yml b/roles/ands_storage/tasks/nfs.yml
index 111992e..98a23be 100644
--- a/roles/ands_storage/tasks/nfs.yml
+++ b/roles/ands_storage/tasks/nfs.yml
@@ -7,9 +7,12 @@
 
 - name: set mountpoints
   mount: name=/mnt/ands src="{{ ands_nfs_server }}:/mnt/ands" fstype=nfs4 opts=defaults,minorversion=1,_netdev,nofail,soft,nodiratime,noatime dump=0 passno=0 state="{{ ands_mount_nfs | default(false) | ternary ('mounted', 'absent') }}"
-  when:  ands_nfs_server is defined
+  when:  
+    - ands_nfs_server is defined
+    - ands_nfs_server | default(None) not in ansible_all_ipv4_addresses
 
 - name: set mountpoints
   mount: name=/mnt/pdv src="{{ ands_pdv_server }}:/mnt/pdv" fstype=nfs opts=defaults,_netdev,nofail,soft,nodiratime,noatime dump=0 passno=0 state=mounted
-  when: ands_pdv_server is defined
-
+  when: 
+    - ands_pdv_server is defined
+    - ands_pdv_server | default(None) not in ansible_all_ipv4_addresses
-- 
cgit v1.2.1