diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml index 9aca9f1cd4..6941e93122 100644 --- a/deployment/memcached/memcached-container-puppet.yaml +++ b/deployment/memcached/memcached-container-puppet.yaml @@ -138,6 +138,7 @@ outputs: - 'v' - '' memcached::disable_cachedump: true + memcached::logfile: '/var/log/memcached/memcached.log' service_config_settings: collectd: tripleo.collectd.plugins.memcached: @@ -153,7 +154,18 @@ outputs: step_config: | include ::tripleo::profile::base::memcached config_image: {get_param: ContainerMemcachedConfigImage} - kolla_config: {} + kolla_config: + /var/lib/kolla/config_files/memcached.json: + command: bash -c $* -- eval source /etc/sysconfig/memcached; exec /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true + permissions: + - path: /var/log/memcached + owner: memcached:memcached + recurse: true docker_config: step_1: memcached: @@ -168,8 +180,20 @@ outputs: list_concat: - {get_attr: [ContainersCommon, volumes]} - - - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro - command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; exec /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS'] + - /var/lib/kolla/config_files/memcached.json:/var/lib/kolla/config_files/config.json:ro + - /var/lib/config-data/puppet-generated/memcached:/var/lib/kolla/config_files/src:rw,z + - /var/log/containers/memcached:/var/log/memcached:rw + environment: + KOLLA_CONFIG_STRATEGY: COPY_ALWAYS + host_prep_tasks: + - name: create persistent directories + file: + path: "{{ item.path }}" + state: directory + setype: "{{ item.setype }}" + mode: "{{ item.mode }}" + with_items: + - { 'path': /var/log/containers/memcached, 'setype': container_file_t, 'mode': '0750' } upgrade_tasks: [] external_upgrade_tasks: - when: