nfs: rename host to have ceph- prefix

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/Vagrantfile b/Vagrantfile
index d6632fc827eed8d24f334134b46ff242f374ab7e..0b09cfda0a8a2bea59d6515fd9a4120123e8e7e1 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -293,8 +293,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   (0..NNFSS - 1).each do |i|
-    config.vm.define "nfs#{i}" do |nfs|
-      nfs.vm.hostname = "#{LABEL_PREFIX}ceph-nfs#{i}"
+    config.vm.define "#{LABEL_PREFIX}nfs#{i}" do |nfs|
+      nfs.vm.hostname = "#{LABEL_PREFIX}nfs#{i}"
       if ASSIGN_STATIC_IP
         nfs.vm.network :private_network,
           ip: "#{PUBLIC_SUBNET}.6#{i}"

diff --git a/roles/ceph-nfs/tasks/pre_requisite.yml b/roles/ceph-nfs/tasks/pre_requisite.yml
index 2eb1bce47522f2c40cc0029e2e502e4395b16434..32570ce5bf43f40be4f13726414e3a33bc65eb11 100644 (file)
--- a/roles/ceph-nfs/tasks/pre_requisite.yml
+++ b/roles/ceph-nfs/tasks/pre_requisite.yml
@@ -44,9 +44,6 @@
   notify:
     - restart ceph nfss
 
-- name: cat ganesha conf file to view overrides
-  command: cat /etc/ganesha/ganesha.conf
-
 - name: start nfs gateway service
   service:
     name: nfs-ganesha

diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts
index 5e1ac46f6d20ca46a04de067af72b05a1d229d95..8ef58a40362038bcd907aa3589e2328c17f1a487 100644 (file)
--- a/tests/functional/centos/7/cluster/hosts
+++ b/tests/functional/centos/7/cluster/hosts
@@ -19,4 +19,4 @@ ceph-client0
 ceph-mgr0
 
 [nfss]
-nfs0
+ceph-nfs0