summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2015-12-14 16:50:57 +0800
committercarey.xu <carey.xuhan@huawei.com>2015-12-15 09:09:17 +0800
commit3e7d82a8f6527755c8eee5788235807dbb8a3df0 (patch)
treede7860346ff5f1d107c5390297047b39644c9406 /deploy/adapters/ansible/openstack
parent8345054b0c24c7acb3bca5bb41f9f0e5508c468c (diff)
fix some memcached configuration error
JIRA: COMPASS-192 Change-Id: I919afb3c109fed151d35d94e323111b85e44073b Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/openstack')
-rw-r--r--deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml11
-rw-r--r--deploy/adapters/ansible/openstack/templates/nova.conf9
2 files changed, 9 insertions, 11 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 8dadd584..a60b3d05 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -1,21 +1,19 @@
---
- hosts: all
remote_user: root
- sudo: True
roles:
- common
- setup-network
- hosts: ha
remote_user: root
- sudo: True
roles:
- ha
- hosts: controller
remote_user: root
- sudo: True
roles:
+ - memcached
- database
- mq
- keystone
@@ -38,7 +36,6 @@
- hosts: compute
remote_user: root
- sudo: True
roles:
- nova-compute
- neutron-compute
@@ -47,13 +44,11 @@
- hosts: all
remote_user: root
- sudo: True
roles:
- odl_cluster
- hosts: all
remote_user: root
- sudo: True
roles:
- onos_cluster
@@ -65,24 +60,20 @@
- hosts: controller
remote_user: root
- sudo: True
roles:
- ext-network
- hosts: ceph_adm
remote_user: root
- sudo: True
roles:
- ceph-deploy
- hosts: all
remote_user: root
- sudo: True
roles:
- monitor
- hosts: all
remote_user: root
- sudo: True
roles:
- secgroup
diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf
index 2364132e..cec11440 100644
--- a/deploy/adapters/ansible/openstack/templates/nova.conf
+++ b/deploy/adapters/ansible/openstack/templates/nova.conf
@@ -1,3 +1,9 @@
+{% set memcached_servers = [] %}
+{% for host in haproxy_hosts.values() %}
+{% set _ = memcached_servers.append('%s:11211'% host) %}
+{% endfor %}
+{% set memcached_servers = memcached_servers|join(',') %}
+
[DEFAULT]
dhcpbridge_flagfile=/etc/nova/nova.conf
dhcpbridge=/usr/bin/nova-dhcpbridge
@@ -49,7 +55,7 @@ notify_on_state_change = vm_and_task_state
notification_driver = nova.openstack.common.notifier.rpc_notifier
notification_driver = ceilometer.compute.nova_notifier
-memcached_servers = {{ internal_vip.ip }}:11211
+memcached_servers = {{ memcached_servers }}
[database]
# The SQLAlchemy connection string used to connect to the database
@@ -64,6 +70,7 @@ identity_uri = http://{{ internal_vip.ip }}:35357
admin_tenant_name = service
admin_user = nova
admin_password = {{ NOVA_PASS }}
+memcached_servers = {{ memcached_servers }}
[glance]
host = {{ internal_vip.ip }}