diff --git a/manifests/config.pp b/manifests/config.pp index c25261c8e..0b720da81 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -62,12 +62,14 @@ class openstack_integration::config ( # Note (dmsimard): ipv6 parsing in Swift and keystone_authtoken are # different: https://bugs.launchpad.net/swift/+bug/1610064 $memcached_servers = ["inet6:[${host}]:11211"] + $memcache_servers = ["[${host}]:11211"] $swift_memcached_servers = ["[${host}]:11211"] } else { $host = '127.0.0.1' $hostname = 'localhost' $ip_version = '4' $memcached_servers = ["${host}:11211"] + $memcache_servers = $memcached_servers $swift_memcached_servers = $memcached_servers } diff --git a/manifests/heat.pp b/manifests/heat.pp index 7613942f6..e47767a0f 100644 --- a/manifests/heat.pp +++ b/manifests/heat.pp @@ -46,6 +46,11 @@ class openstack_integration::heat ( class { 'heat::logging': debug => true, } + class { 'heat::cache': + backend => 'dogpile.cache.pymemcache', + enabled => true, + memcache_servers => $::openstack_integration::config::memcache_servers, + } class { 'heat::db': database_connection => os_database_connection({ 'dialect' => 'mysql+pymysql', diff --git a/manifests/keystone.pp b/manifests/keystone.pp index 65f34d60e..68473f722 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -63,7 +63,11 @@ class openstack_integration::keystone ( class { 'keystone::logging': debug => true, } - include keystone::cache + class { 'keystone::cache': + backend => 'dogpile.cache.pymemcache', + enabled => true, + memcache_servers => $::openstack_integration::config::memcache_servers, + } class { 'keystone': enabled => true, service_name => 'httpd', diff --git a/manifests/nova.pp b/manifests/nova.pp index d1e6839bc..7ff5b728a 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -159,6 +159,11 @@ class openstack_integration::nova ( service_name => 'httpd', nova_metadata_wsgi_enabled => true, } + class { 'nova::cache': + backend => 'dogpile.cache.pymemcache', + enabled => true, + memcache_servers => $::openstack_integration::config::memcache_servers, + } class { 'nova::db::sync': extra_params => '--debug', db_sync_timeout => 600,