From: Markos Chandras <mchandras@suse.de>
Date: Mon, 4 Sep 2017 13:48:24 +0000 (+0100)
Subject: xci: configure-nfs: Install the NFS server package
X-Git-Tag: 6.0.0~312
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=725e250ad2d36697487df629002a7caa7114c6d3;p=releng-xci.git

xci: configure-nfs: Install the NFS server package

We need to explicitly install the nfs server package instead of bundling
it to the dib image since not every node needs it.

Change-Id: I73f59f4ed582359df80ea08712b433537c087aea
Signed-off-by: Markos Chandras <mchandras@suse.de>
---

diff --git a/xci/playbooks/roles/configure-nfs/tasks/main.yml b/xci/playbooks/roles/configure-nfs/tasks/main.yml
index df33e52f..25e81496 100644
--- a/xci/playbooks/roles/configure-nfs/tasks/main.yml
+++ b/xci/playbooks/roles/configure-nfs/tasks/main.yml
@@ -43,6 +43,12 @@
   with_items:
     - "/images         *(rw,sync,no_subtree_check,no_root_squash)"
     - "/volumes        *(rw,sync,no_subtree_check,no_root_squash)"
+
+- name: Install the NFS server package
+  package:
+    name: "{{ nfs_server_package }}"
+    state: latest
+
 - name: restart NFS service
   service:
     name: "{{ nfs_server_service }}"
diff --git a/xci/playbooks/roles/configure-nfs/vars/debian.yml b/xci/playbooks/roles/configure-nfs/vars/debian.yml
index 8d3c6561..cb3b2084 100644
--- a/xci/playbooks/roles/configure-nfs/vars/debian.yml
+++ b/xci/playbooks/roles/configure-nfs/vars/debian.yml
@@ -7,5 +7,5 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-
+nfs_server_package: "nfs-kernel-server"
 nfs_server_service: "nfs-kernel-server"
diff --git a/xci/playbooks/roles/configure-nfs/vars/suse.yml b/xci/playbooks/roles/configure-nfs/vars/suse.yml
index c60cafa5..01173d8a 100644
--- a/xci/playbooks/roles/configure-nfs/vars/suse.yml
+++ b/xci/playbooks/roles/configure-nfs/vars/suse.yml
@@ -7,5 +7,5 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-
+nfs_server_package: "nfs-kernel-server"
 nfs_server_service: "nfs-server"
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index f3b3c0cc..1a84faeb 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -74,19 +74,19 @@ case ${OS_FAMILY,,} in
     debian)
         export DIB_OS_RELEASE="${DIB_OS_RELEASE:-xenial}"
         export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-ubuntu-minimal}"
-        export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl,chrony,iptables,nfs-kernel-server}"
+        export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl,chrony,iptables}"
         export EXTRA_DIB_ELEMENTS="${EXTRA_DIB_ELEMENTS:-openssh-server}"
         ;;
     redhat)
         export DIB_OS_RELEASE="${DIB_OS_RELEASE:-7}"
         export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-centos-minimal}"
-        export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vim,less,bridge-utils,iputils,rsyslog,curl,iptables,nfs-kernel-server}"
+        export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vim,less,bridge-utils,iputils,rsyslog,curl,iptables}"
         export EXTRA_DIB_ELEMENTS="${EXTRA_DIB_ELEMENTS:-openssh-server}"
         ;;
     suse)
         export DIB_OS_RELEASE="${DIB_OS_RELEASE:-42.3}"
         export DIB_OS_ELEMENT="${DIB_OS_ELEMENT:-opensuse-minimal}"
-        export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vim,less,bridge-utils,iputils,rsyslog,curl,iptables,nfs-kernel-server}"
+        export DIB_OS_PACKAGES="${DIB_OS_PACKAGES:-vim,less,bridge-utils,iputils,rsyslog,curl,iptables}"
         export EXTRA_DIB_ELEMENTS="${EXTRA_DIB_ELEMETS:-openssh-server}"
         ;;
 esac