diff options
| author |   shuai chen <chenshuai@huawei.com> | 2015-12-29 01:45:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-29 01:45:55 +0000 |
| commit | 5c72769b17d876c660216f844bea24e89fc858ec (patch) | |
| tree | eff182bd06b039d9fab78925a80b519d749adef4 /deploy/adapters/ansible/roles/cinder-controller | |
| parent | ff1f58c46f35acad2c0ecb16b700d2784a653286 (diff) | |
| parent | a074bf874bfef148de55544988bbfbd39badcd4d (diff) | |
Merge "bugfix: cinder scheduler service is not restart when configuration updated"
Diffstat (limited to 'deploy/adapters/ansible/roles/cinder-controller')
| -rw-r--r-- | deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml b/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml index 5491dcf0..1df53e24 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml +++ b/deploy/adapters/ansible/roles/cinder-controller/tasks/main.yml @@ -13,3 +13,5 @@ - config - cinder-config - cinder + +- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf index 3714aa50..8ecda649 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf +++ b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf @@ -3,7 +3,7 @@ rootwrap_config = /etc/cinder/rootwrap.conf api_paste_confg = /etc/cinder/api-paste.ini iscsi_helper = tgtadm volume_name_template = volume-%s -volume_group = cinder-volumes +volume_group = storage-volumes verbose = {{ VERBOSE }} debug = {{ DEBUG }} auth_strategy = keystone @@ -39,7 +39,6 @@ volume_name_template = volume-%s snapshot_name_template = snapshot-%s max_gigabytes=10000 -volume_group=cinder-volumes volume_clear=zero volume_clear_size=10 |