install compass-core in centos7

JIRA: COMPASS-208

Change-Id: Ie98615df37115beaa0ad8f744cc87162452af751
Signed-off-by: baigk <baiguoku@huawei.com>

7 files changed, 10 insertions, 17 deletions

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
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index 958bf33b..71d9ad6c 100644
--- a/deploy/compass_vm.sh
+++ b/deploy/compass_vm.sh
@@ -67,6 +67,7 @@ function launch_compass() {
     chmod 755 -R $new_mnt
 
     cp $COMPASS_DIR/util/isolinux.cfg $new_mnt/isolinux/ -f
+    cp $COMPASS_DIR/util/ks.cfg $new_mnt/isolinux/ -f
 
     sed -i -e "s/REPLACE_MGMT_IP/$MGMT_IP/g" \
            -e "s/REPLACE_MGMT_NETMASK/$MGMT_MASK/g" \
diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index 45970a05..440b3e03 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -12,7 +12,7 @@ export MGMT_IP_END=${MGMT_IP_END:-192.168.200.254}
 export EXTERNAL_NIC=${EXTERNAL_NIC:-eth0}
 export CLUSTER_NAME="opnfv2"
 export DOMAIN="ods.com"
-export PARTITIONS="/=70%,/home=5%,/tmp=5%,/var=20%"
+export PARTITIONS="/=30%,/home=5%,/tmp=5%,/var=60%"
 export SUBNETS="10.1.0.0/24,172.16.2.0/24,172.16.3.0/24,172.16.4.0/24"
 
 export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-'10.1.0.50'}
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index f5ccdf30..f741895b 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,6 +1,6 @@
 # for Operating System
 export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'}
-#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*1503-01.*'}
+#export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*15.*'}
 
 # trustry/centos7
 export OS_VERSION=${OS_VERSION:-"trusty"}
diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf
index 0dbdb28b..611aca76 100644
--- a/deploy/conf/virtual.conf
+++ b/deploy/conf/virtual.conf
@@ -1,7 +1,7 @@
 export VIRT_NUMBER=5
 export VIRT_CPUS=4
 export VIRT_MEM=16384
-export VIRT_DISK=30G
+export VIRT_DISK=50G
 
 export SWITCH_IPS="1.1.1.1"
 export SWITCH_CREDENTIAL="version=2c,community=public"