diff options
Diffstat (limited to 'deploy/adapters/ansible')
7 files changed, 48 insertions, 22 deletions
diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf index eb7ec053..114453ee 100644 --- a/deploy/adapters/ansible/openstack/templates/nova.conf +++ b/deploy/adapters/ansible/openstack/templates/nova.conf @@ -37,7 +37,6 @@ instance_usage_audit_period = hour notify_on_state_change = vm_and_task_state notification_driver = nova.openstack.common.notifier.rpc_notifier notification_driver = ceilometer.compute.nova_notifier -memcached_servers = {{ memcached_servers }} osapi_compute_workers = {{ api_workers }} metadata_workers = {{ api_workers }} @@ -119,3 +118,7 @@ rabbit_password = {{ RABBIT_PASS }} rabbit_port = 5672 rabbit_userid = {{ RABBIT_USER }} +[cache] +backend = dogpile.cache.memcached +enabled = True +memcache_servers = {{ memcached_servers }} diff --git a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml index 84515267..5d9138bb 100755 --- a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml +++ b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml @@ -56,24 +56,30 @@ /etc/cinder/cinder.conf; sed -i 's/^\(rbd_secret_uuid\).*/\1 = {{ ceph_uuid }}/g' \ /etc/cinder/cinder.conf; - sed -i '/^\[DEFAULT/a rbd_pool = volumes' \ - /etc/cinder/cinder.conf; - sed -i '/^\[DEFAULT/a rbd_ceph_conf = /etc/ceph/ceph.conf' \ - /etc/cinder/cinder.conf; - sed -i '/^\[DEFAULT/a rbd_flatten_volume_from_snapshot = false' \ - /etc/cinder/cinder.conf; - sed -i '/^\[DEFAULT/a rbd_max_clone_depth = 5' \ - /etc/cinder/cinder.conf; - sed -i '/^\[DEFAULT/a rbd_store_chunk_size = 4' \ - /etc/cinder/cinder.conf; - sed -i '/^\[DEFAULT/a rados_connect_timeout = -1' \ - /etc/cinder/cinder.conf; - sed -i '/^\[DEFAULT/a glance_api_version = 2' \ - /etc/cinder/cinder.conf; - sed -i '/^\[DEFAULT/a rbd_user = cinder' \ - /etc/cinder/cinder.conf; - sed -i '/^\[DEFAULT/a rbd_secret_uuid = {{ ceph_uuid }}' \ - /etc/cinder/cinder.conf; + crudini --set /etc/cinder/cinder.conf DEFAULT enabled_backends \ + ceph; + crudini --del /etc/cinder/cinder.conf lvm + crudini --set /etc/cinder/cinder.conf ceph volume_driver \ + cinder.volume.drivers.rbd.RBDDriver; + crudini --set /etc/cinder/cinder.conf ceph volume_backend_name \ + ceph; + crudini --set /etc/cinder/cinder.conf ceph rbd_pool volumes; + crudini --set /etc/cinder/cinder.conf ceph rbd_ceph_conf \ + /etc/ceph/ceph.conf; + crudini --set /etc/cinder/cinder.conf ceph rbd_flatten_volume_from_snapshot \ + false; + crudini --set /etc/cinder/cinder.conf ceph rbd_max_clone_depth \ + 5; + crudini --set /etc/cinder/cinder.conf ceph rbd_store_chunk_size \ + 4; + crudini --set /etc/cinder/cinder.conf ceph rados_connect_timeout \ + -1; + crudini --set /etc/cinder/cinder.conf ceph glance_api_version \ + 2; + crudini --set /etc/cinder/cinder.conf ceph rbd_user \ + cinder; + crudini --set /etc/cinder/cinder.conf ceph rbd_secret_uuid \ + {{ ceph_uuid }}; when: inventory_hostname in groups['compute'] tags: - ceph_conf_cinder diff --git a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf index 4ad2da2e..25d3cdd9 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf +++ b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf @@ -51,7 +51,6 @@ iscsi_port = 3260 iscsi_helper = tgtadm volumes_dir = /var/lib/cinder/volumes -volume_driver = cinder.volume.drivers.lvm.LVMISCSIDriver [database] connection = mysql://cinder:{{ CINDER_DBPASS }}@{{ db_host }}/cinder diff --git a/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf index e7946b5c..9a5ca005 100644 --- a/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf +++ b/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf @@ -17,6 +17,8 @@ control_exchange = cinder rpc_backend = rabbit my_ip = {{ storage_controller_host }} +enabled_backends = lvm + glance_host = {{ internal_vip.ip }} glance_port = 9292 glance_api_servers = http://{{ internal_vip.ip }}:9292 @@ -44,7 +46,6 @@ iscsi_port=3260 iscsi_helper=tgtadm volumes_dir=/var/lib/cinder/volumes -volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver [database] connection = mysql://cinder:{{ CINDER_DBPASS }}@{{ db_host }}/cinder @@ -67,7 +68,7 @@ admin_password = {{ CINDER_PASS }} [lvm] volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver -volume_group = cinder-volumes +volume_group = storage-volumes iscsi_protocol = iscsi iscsi_helper = tgtadm diff --git a/deploy/adapters/ansible/roles/cinder-volume/vars/Debian.yml b/deploy/adapters/ansible/roles/cinder-volume/vars/Debian.yml index d95b779c..8c3cb728 100644 --- a/deploy/adapters/ansible/roles/cinder-volume/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/cinder-volume/vars/Debian.yml @@ -12,3 +12,4 @@ packages: services: - cinder-volume + - tgt diff --git a/deploy/adapters/ansible/roles/cinder-volume/vars/RedHat.yml b/deploy/adapters/ansible/roles/cinder-volume/vars/RedHat.yml index 6d596f4b..892c66d8 100644 --- a/deploy/adapters/ansible/roles/cinder-volume/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/cinder-volume/vars/RedHat.yml @@ -17,3 +17,4 @@ packages: services: - openstack-cinder-volume - lvm2-lvmetad + - target diff --git a/deploy/adapters/ansible/roles/memcached/tasks/main.yml b/deploy/adapters/ansible/roles/memcached/tasks/main.yml index a4457f36..2b4b7ec7 100644 --- a/deploy/adapters/ansible/roles/memcached/tasks/main.yml +++ b/deploy/adapters/ansible/roles/memcached/tasks/main.yml @@ -19,6 +19,8 @@ - name: install packages action: "{{ ansible_pkg_mgr }} name={{ item }} state=latest update_cache=yes" with_items: "{{ packages | union(packages_noarch) }}" + notify: + - restart memcahed services - name: enable auto start file: @@ -32,4 +34,17 @@ notify: - restart memcahed services +- name: change memcache listen ip + lineinfile: + dest=/etc/sysconfig/memcached + regexp="^OPTIONS=.*" + line="OPTIONS=\"-l 0.0.0.0\"" + when: ansible_os_family == "RedHat" + notify: + - restart memcahed services + +- name: generate memcached service list + lineinfile: dest=/opt/service create=yes line='{{ item }}' + with_items: "{{ services | union(services_noarch) }}" + - meta: flush_handlers |