2 Commits

Author SHA1 Message Date
Michael Johnson
8c3e2e1602 Disable default haproxy process in amphora image
This patch disables the default haproxy process from starting in
the amphora image.
Closes-Bug: #1527691

Change-Id: Iccac03b982e47fc85f8e6beb0cc55a80b73ab465
2016-01-13 19:50:41 +00:00
Michael Johnson
12b1e57561 Fix sysctl settings for amphora image
This patch fixes two things:
1. The sysctl settings were failing because some conntrack modules
were not loaded anymore.
2. I fixed the sysctl-set-value scripts to be able to handle
multi-value settings, such as tcp_rmem, in tripleo-image-elements[1].
Here I have removed the workaround we had in Octavia.

[1] https://review.openstack.org/#/c/134616/

Change-Id: Ib7ab4f487c1b792b70a110098bf7a28cb565ee55
Closes-Bug: #1527392
2015-12-18 01:01:19 +00:00