diff --git a/manifests/api.pp b/manifests/api.pp index 65e77a1..cf2bfaf 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -50,6 +50,11 @@ class openstack_health::api( version => 'system', } + class { '::memcached': + max_memory => '60%', + listen_ip => '127.0.0.1', + } + vcsrepo { $elastic_recheck_dir : ensure => latest, owner => 'openstack_health', @@ -95,9 +100,16 @@ class openstack_health::api( ensure => present, } + package {'libmemcached-dev': + ensure => present, + } + exec { 'requirements': - command => "${virtualenv_dir}/bin/pip install -U -r ${source_dir}/requirements.txt", - require => Python::Virtualenv[$virtualenv_dir], + command => "${virtualenv_dir}/bin/pip install -U -r ${source_dir}/requirements.txt pylibmc", + require => [ + Python::Virtualenv[$virtualenv_dir], + Package['libmemcached-dev'], + ], subscribe => Vcsrepo[$source_dir], refreshonly => true, timeout => 1800, diff --git a/metadata.json b/metadata.json index 99bb290..90cd9fa 100644 --- a/metadata.json +++ b/metadata.json @@ -19,6 +19,7 @@ } ], "dependencies": [ - {"name":"openstackinfra/vcsrepo","version_requirement":">= 0.0.8"} + {"name":"openstackinfra/vcsrepo","version_requirement":">= 0.0.8"}, + {"name":"saz/memcached","version_requirement":">= 2.8.1"} ] } diff --git a/templates/openstack-health.conf.erb b/templates/openstack-health.conf.erb index c54c0c1..d9921f3 100644 --- a/templates/openstack-health.conf.erb +++ b/templates/openstack-health.conf.erb @@ -1,6 +1,8 @@ [default] query_dir = <%= @elastic_recheck_dir %>/queries cache_expiration = <%= @cache_expiration %> +cache_backend = dogpile.cache.pylibmc +cache_url = 127.0.0.1 db_uri = <%= scope.lookupvar("openstack_health::api::db_uri") %> <% if @ignored_keys.length > 0 -%> ignored_run_metadata_keys =