fix restart glance service takes no effect

JIRA: COMPASS-100
  - using service instead of glance-control

Change-Id: I659e7de13e0fd8440bbe56557c8f0776e46becc0
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>

diff --git a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_openstack_conf.yml b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_openstack_conf.yml
index cb95cf0..2c194fa 100644 (file)
--- a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_openstack_conf.yml
+++ b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_openstack_conf.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: modify glance-api.conf for ceph
-  shell: ssh -o StrictHostKeyChecking=no {{ item }} -t "sed -i 's/^\(default_store\).*/\1 = rbd/' /etc/glance/glance-api.conf && sed -i '/^\[glance_store/a stores = rbd\nrbd_store_pool = images\nrbd_store_user = glance\nrbd_store_ceph_conf = /etc/ceph/ceph.conf\nrbd_store_chunk_size = 8\nshow_image_direct_url=True' /etc/glance/glance-api.conf && glance-control api restart"
+  shell: ssh -o StrictHostKeyChecking=no {{ item }} -t "sed -i 's/^\(default_store\).*/\1 = rbd/' /etc/glance/glance-api.conf && sed -i '/^\[glance_store/a stores = rbd\nrbd_store_pool = images\nrbd_store_user = glance\nrbd_store_ceph_conf = /etc/ceph/ceph.conf\nrbd_store_chunk_size = 8\nshow_image_direct_url=True' /etc/glance/glance-api.conf && service {{ glance_service }} restart"
   with_items:
     - "{{ groups['controller'] }}"
   tags:

diff --git a/deploy/adapters/ansible/roles/ceph-deploy/vars/Debian.yml b/deploy/adapters/ansible/roles/ceph-deploy/vars/Debian.yml
index 04eda09..86fecb7 100644 (file)
--- a/deploy/adapters/ansible/roles/ceph-deploy/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/ceph-deploy/vars/Debian.yml
@@ -19,3 +19,4 @@ services: []
 
 cinder_service: cinder-volume
 nova_service: nova-compute
+glance_service: glance-api

diff --git a/deploy/adapters/ansible/roles/ceph-deploy/vars/RedHat.yml b/deploy/adapters/ansible/roles/ceph-deploy/vars/RedHat.yml
index 14e8428..a2c18ba 100644 (file)
--- a/deploy/adapters/ansible/roles/ceph-deploy/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/ceph-deploy/vars/RedHat.yml
@@ -9,3 +9,4 @@ services: []
 
 cinder_service: openstack-cinder-volume
 nova_service: openstack-nova-compute
+glance_service: openstack-glance-api