Merge "Enable neutron-lbaasv2 UI in Horizon" into stable/pike

diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index d6ffb6d..2c7d7a7 100644 (file)
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@@ -113,7 +113,7 @@ outputs:
             volumes:
               - /var/log/containers/horizon:/var/log/horizon
               - /var/log/containers/httpd/horizon:/var/log/httpd
-              - /var/lib/config-data/horizon/etc/:/etc/
+              - /var/lib/config-data/puppet-generated/horizon/etc/openstack-dashboard:/etc/openstack-dashboard
         step_3:
           horizon:
             image: *horizon_image

diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml
index c78b85a..817f9ec 100644 (file)
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@@ -80,8 +80,8 @@ outputs:
             user: root
             volumes:
                - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro
-               - /var/log/memcached.log:/var/log/memcached.log
-            command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; chown ${USER} /var/log/memcached.log']
+               - /var/log/containers/memcached:/var/log/
+            command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; touch /var/log/memcached.log && chown ${USER} /var/log/memcached.log']
           memcached:
             start_order: 1
             image: *memcached_image
@@ -93,7 +93,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro
-            # TODO(bogdando) capture memcached syslog logs from a container
+                  - /var/log/containers/memcached:/var/log/
             command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS']
       upgrade_tasks:
         - name: Stop and disable memcached service

diff --git a/puppet/services/memcached.yaml b/puppet/services/memcached.yaml
index 2bc08fd..30ea4e1 100644 (file)
--- a/puppet/services/memcached.yaml
+++ b/puppet/services/memcached.yaml
@@ -54,6 +54,7 @@ outputs:
         # internal_api_subnet - > IP/CIDR
         memcached::listen_ip: {get_param: [ServiceNetMap, MemcachedNetwork]}
         memcached::max_memory: {get_param: MemcachedMaxMemory}
+        memcached::verbosity: 'v'
         tripleo.memcached.firewall_rules:
           '121 memcached':
             dport: 11211