diff options
| author |   Justin chi <chigang@huawei.com> | 2015-10-15 01:45:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-15 01:45:40 +0000 |
| commit | 7a591773b61e1a512bf6d0984630c7a8ec5865af (patch) | |
| tree | 247bccb6f91d7ca86da1fca8ab130ff4fee0e87d /deploy/adapters/ansible/roles | |
| parent | 4fde268319667485c8322661397ec8b5a2e3a05f (diff) | |
| parent | cfdeb9c2fdf7935782a59d496e095bdc9b8fd499 (diff) | |
Merge "fix restart glance service takes no effect"
Diffstat (limited to 'deploy/adapters/ansible/roles')
3 files changed, 3 insertions, 1 deletions
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 cb95cf07..2c194fae 100644 --- 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 04eda092..86fecb79 100644 --- 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 14e8428e..a2c18ba6 100644 --- 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 |