aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-05-05 02:35:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-05 02:35:56 +0000
commitc1c6026466942ef01174e639eccc7a5b51797107 (patch)
treeff8d0848c86e67a3da17bd23fdcf54973d3036e4
parenta79f5aa4710edd8dfa73364223b7d6f266d04587 (diff)
parent2f838b0d5ea2fbc50ae3ebdc90fef656fdc19f7c (diff)
Merge "Fix memcached doesn't start issue" into stable/danubedanube.2.0
-rw-r--r--deploy/adapters/ansible/openstack/templates/nova.conf5
-rw-r--r--deploy/adapters/ansible/roles/memcached/tasks/main.yml15
2 files changed, 19 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf
index 3cd2c03..661a718 100644
--- a/deploy/adapters/ansible/openstack/templates/nova.conf
+++ b/deploy/adapters/ansible/openstack/templates/nova.conf
@@ -42,7 +42,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 }}
@@ -124,3 +123,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/memcached/tasks/main.yml b/deploy/adapters/ansible/roles/memcached/tasks/main.yml
index a4457f3..2b4b7ec 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