Merge "Fix standalone ControllerOpenstack vars" 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 817f9ec..67b8424 100644 (file)
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@@ -94,7 +94,15 @@ outputs:
                 -
                   - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro
                   - /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']
+            # NOTE: We're adding the log redirection here, even though should
+            # already be part of the options. This is because the redirection
+            # via the options is not working and ends up being passed as a
+            # parameter to the memcached command (which it silently ignores).
+            # Thus the need for the explicit redirection here. The redirection
+            # will be removed from the $OPTIONS, which is done via the puppet
+            # module, but we'll only be able to do this once the following pull
+            # request merges: https://github.com/saz/puppet-memcached/pull/88
+            command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS >> /var/log/memcached.log 2>&1']
       upgrade_tasks:
         - name: Stop and disable memcached service
           tags: step2

diff --git a/puppet/services/neutron-lbaas.yaml b/puppet/services/neutron-lbaas.yaml
index ec477dd..a2c1a2a 100644 (file)
--- a/puppet/services/neutron-lbaas.yaml
+++ b/puppet/services/neutron-lbaas.yaml
@@ -73,3 +73,6 @@ outputs:
       service_config_settings:
         neutron_api:
           neutron::server::service_providers: {get_param: NeutronServiceProviders}
+        horizon:
+          horizon::neutron_options:
+            enable_lb: True

diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml
index a1a6020..879af2a 100644 (file)
--- a/puppet/services/rabbitmq.yaml
+++ b/puppet/services/rabbitmq.yaml
@@ -41,7 +41,7 @@ parameters:
   RabbitFDLimit:
     default: 65536
     description: Configures RabbitMQ FD limit
-    type: string
+    type: number
   RabbitIPv6:
     default: false
     description: Enable IPv6 in RabbitMQ