d8691bcd9d
Currently we spawn haproxy with: ip netns exec ${NETNS}
/usr/sbin/haproxy -Ds $ARGS.
The reason for that was that with -Ds we keep a process in the foreground:
-Ds Start in systemd daemon mode, keeping a process in foreground.
Since haproxy 1.8 removed the
haproxy-systemd-wrapper it also removed the '-Ds' option. In order to
keep things running in the foreground we can just switch to using '-Ws'
Which is the multiworker mode with systemd support which keeps the
process in the foregroud.
This commit keeps backward compatibility with current HAProxy to ease
the transition to new HAProxy.
Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com>
Change-Id: Ia914de9b3438976d24bf09ad680e806a0fb6644e
97 lines
3.1 KiB
Ruby
97 lines
3.1 KiB
Ruby
#
|
|
# Copyright (C) 2018 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
require 'spec_helper'
|
|
|
|
describe 'tripleo::profile::base::neutron::wrappers::haproxy' do
|
|
|
|
let :title do
|
|
'haproxy_wrapper'
|
|
end
|
|
|
|
shared_examples_for 'tripleo::profile::base::neutron::wrappers::haproxy' do
|
|
|
|
context 'creates wrapper file for docker' do
|
|
let(:params) {
|
|
{
|
|
:haproxy_process_wrapper => '/usr/local/bin/haproxy',
|
|
:haproxy_image => 'a_registry/some_container_name:some_tag',
|
|
:bind_socket => 'unix:///run/another/docker.sock',
|
|
:container_cli => 'docker',
|
|
:debug => true,
|
|
}
|
|
}
|
|
|
|
it 'should generate a wrapper file' do
|
|
is_expected.to contain_file('/usr/local/bin/haproxy').with(
|
|
:mode => '0755'
|
|
)
|
|
is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
|
|
/a_registry.some_container_name.some_tag/
|
|
)
|
|
is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
|
|
/^NAME=neutron-haproxy-/
|
|
)
|
|
is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
|
|
/export DOCKER_HOST="unix:...run.another.docker.sock/
|
|
)
|
|
is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
|
|
/set -x/
|
|
)
|
|
is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
|
|
/.*haproxy -Ds.*haproxy -Ws.*/
|
|
)
|
|
end
|
|
end
|
|
|
|
context 'creates wrapper file for podman' do
|
|
let(:params) {
|
|
{
|
|
:haproxy_process_wrapper => '/usr/local/bin/haproxy',
|
|
:haproxy_image => 'a_registry/some_container_name:some_tag',
|
|
:container_cli => 'podman',
|
|
:debug => false,
|
|
}
|
|
}
|
|
|
|
it 'should generate a wrapper file' do
|
|
is_expected.to contain_file('/usr/local/bin/haproxy').with(
|
|
:mode => '0755'
|
|
)
|
|
is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
|
|
/a_registry.some_container_name.some_tag/
|
|
)
|
|
is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
|
|
/^NAME=neutron-haproxy-/
|
|
)
|
|
is_expected.to contain_file('/usr/local/bin/haproxy').with_content(
|
|
/.*haproxy -Ds.*haproxy -Ws.*/
|
|
)
|
|
end
|
|
end
|
|
end
|
|
|
|
on_supported_os.each do |os, facts|
|
|
context "on #{os}" do
|
|
let(:facts) do
|
|
facts.merge({ :hostname => 'node.example.com' })
|
|
end
|
|
|
|
it_behaves_like 'tripleo::profile::base::neutron::wrappers::haproxy'
|
|
end
|
|
end
|
|
end
|