summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2015-11-10 09:04:18 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-11-10 09:04:18 +0000
commitd1088174620fec05caf6899809a999bfc21d57d1 (patch)
treea9619943d17d62a78826f73699be5b755849ca44 /deploy
parent228b9531aa8aecf486aadc24c0d68aaf5b6cd04b (diff)
parent575c16c3df6a1fa2703cf4a5e9ba76a2f409bc5e (diff)
Merge "bugfix: need start rpcbind on centos7"
Diffstat (limited to 'deploy')
-rw-r--r--deploy/adapters/ansible/roles/glance/tasks/nfs.yml6
-rw-r--r--deploy/adapters/ansible/roles/glance/vars/Debian.yml1
-rw-r--r--deploy/adapters/ansible/roles/glance/vars/RedHat.yml4
-rw-r--r--deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml1
4 files changed, 11 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/glance/tasks/nfs.yml b/deploy/adapters/ansible/roles/glance/tasks/nfs.yml
index dc1be977..ff96c64a 100644
--- a/deploy/adapters/ansible/roles/glance/tasks/nfs.yml
+++ b/deploy/adapters/ansible/roles/glance/tasks/nfs.yml
@@ -17,7 +17,7 @@
line="/opt/images *(rw,insecure,sync,all_squash)"
run_once: True
-- name: restart nfs service
+- name: restart compass nfs service
local_action: service name={{ item }} state=restarted enabled=yes
with_items:
- rpcbind
@@ -32,6 +32,10 @@
shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf
register: ip_info
+- name: restart host nfs service
+ service: name={{ item }} state=restarted enabled=yes
+ with_items: '{{ nfs_services }}'
+
- name: mount image directory
shell: |
mount -t nfs -onfsvers=3 {{ ip_info.stdout_lines[0] }}:/opt/images /var/lib/glance/images
diff --git a/deploy/adapters/ansible/roles/glance/vars/Debian.yml b/deploy/adapters/ansible/roles/glance/vars/Debian.yml
index b295ff28..974ada23 100644
--- a/deploy/adapters/ansible/roles/glance/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/glance/vars/Debian.yml
@@ -6,6 +6,7 @@ packages:
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 e26b7034..bd80d21d 100644
--- a/deploy/adapters/ansible/roles/glance/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/glance/vars/RedHat.yml
@@ -6,6 +6,10 @@ nfs_packages:
- nfs-utils
- rpcbind
+nfs_services:
+ - rpcbind
+ - rpc-statd
+
services:
- openstack-glance-api
- openstack-glance-registry
diff --git a/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml b/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml
index cf882150..386c4e53 100644
--- a/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml
@@ -1,5 +1,6 @@
---
packages:
+ - openstack-neutron
- openstack-neutron-ml2
- openstack-neutron-openvswitch