From 5e3b598f5999a7ab6d49cb294d8e5514003ae20c Mon Sep 17 00:00:00 2001
From: baigk <baiguoku@huawei.com>
Date: Fri, 18 Dec 2015 14:48:26 +0800
Subject: install compass-core in centos7

JIRA: COMPASS-208

Change-Id: Ie98615df37115beaa0ad8f744cc87162452af751
Signed-off-by: baigk <baiguoku@huawei.com>
---
 deploy/adapters/ansible/roles/glance/tasks/nfs.yml   | 11 +++++------
 deploy/adapters/ansible/roles/glance/vars/Debian.yml |  5 +----
 deploy/adapters/ansible/roles/glance/vars/RedHat.yml |  4 ----
 3 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'deploy/adapters/ansible/roles')

diff --git a/deploy/adapters/ansible/roles/glance/tasks/nfs.yml b/deploy/adapters/ansible/roles/glance/tasks/nfs.yml
index ff96c64a..ff72ecb7 100644
--- a/deploy/adapters/ansible/roles/glance/tasks/nfs.yml
+++ b/deploy/adapters/ansible/roles/glance/tasks/nfs.yml
@@ -1,10 +1,9 @@
 ---
-- name: install packages
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: nfs_packages
-
 - name: install nfs
-  local_action: yum  name=nfs-utils state=present
+  local_action: yum  name={{ item }} state=present
+  with_items:
+    - rpcbind
+    - nfs-utils
   run_once: True
 
 - name: create image directory
@@ -21,7 +20,7 @@
   local_action: service name={{ item }} state=restarted enabled=yes
   with_items:
       - rpcbind
-      - nfs
+      - nfs-server
   run_once: True
 
 - name: get mount info
diff --git a/deploy/adapters/ansible/roles/glance/vars/Debian.yml b/deploy/adapters/ansible/roles/glance/vars/Debian.yml
index 974ada23..e7fe2da7 100644
--- a/deploy/adapters/ansible/roles/glance/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/glance/vars/Debian.yml
@@ -1,12 +1,9 @@
 ---
-
 packages:
   - glance
 
-nfs_packages:
-  - nfs-common
-
 nfs_services: []
+
 services:
   - glance-registry
   - glance-api
diff --git a/deploy/adapters/ansible/roles/glance/vars/RedHat.yml b/deploy/adapters/ansible/roles/glance/vars/RedHat.yml
index bd80d21d..fbf77833 100644
--- a/deploy/adapters/ansible/roles/glance/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/glance/vars/RedHat.yml
@@ -2,10 +2,6 @@
 packages:
   - openstack-glance
 
-nfs_packages:
-  - nfs-utils
-  - rpcbind
-
 nfs_services:
   - rpcbind
   - rpc-statd
-- 
cgit 1.2.3-korg