openstack/puppet-tripleo
Code Issues Proposed changes

Neutron wrappers: lookup for THT parameter

Browse Source 
For Neutron DHCP & L3 agents, lookup for DockerAdditionalSockets
parameter in THT.
It basically replaces the default hiera that was taken from the docker
profile but this one will be deprecated in this release and removed
soon.

Also, we change the default to be '/var/lib/openstack/docker.sock'
so it looks for the right socket in default deployments.

Change-Id: I39c84c462793bfe819f876583782acbe0619a89d
This commit is contained in:
Emilien Macchi 2018-05-07 13:23:22 -07:00
parent 08656dc914
commit 3b6c90ad70
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/profile/base/neutron/dhcp_agent_wrappers.pp
View File

@ -49,7 +49,7 @@
# [*bind_sockets*] # [*bind_sockets*]
# (Optional) Domain sockets that the wrappers should use for accessing # (Optional) Domain sockets that the wrappers should use for accessing
# the docker daemon. # the docker daemon.
# Defaults to hiera('tripleo::profile::base::docker::additional_sockets', ['/run/docker.sock']) # Defaults to hiera('docker_additional_sockets', ['/var/lib/openstack/docker.sock'])
# #
class tripleo::profile::base::neutron::dhcp_agent_wrappers ( class tripleo::profile::base::neutron::dhcp_agent_wrappers (
$enable_dnsmasq_wrapper = false, $enable_dnsmasq_wrapper = false,
@ -58,7 +58,7 @@ class tripleo::profile::base::neutron::dhcp_agent_wrappers (
$enable_haproxy_wrapper = false, $enable_haproxy_wrapper = false,
$haproxy_process_wrapper = undef, $haproxy_process_wrapper = undef,
$haproxy_image = undef, $haproxy_image = undef,
$bind_sockets = hiera('tripleo::profile::base::docker::additional_sockets', ['/run/docker.sock']), $bind_sockets = hiera('docker_additional_sockets', ['/var/lib/openstack/docker.sock']),
) { ) {
unless $bind_sockets { unless $bind_sockets {
fail('The wrappers require a domain socket for accessing the docker daemon') fail('The wrappers require a domain socket for accessing the docker daemon')

4
manifests/profile/base/neutron/l3_agent_wrappers.pp
View File

@ -82,7 +82,7 @@
# [*bind_sockets*] # [*bind_sockets*]
# (Optional) Domain sockets that the wrappers should use for accessing # (Optional) Domain sockets that the wrappers should use for accessing
# the docker daemon. # the docker daemon.
# Defaults to hiera('tripleo::profile::base::docker::additional_sockets', ['/run/docker.sock']) # Defaults to hiera('docker_additional_sockets', ['/var/lib/openstack/docker.sock'])
# #
class tripleo::profile::base::neutron::l3_agent_wrappers ( class tripleo::profile::base::neutron::l3_agent_wrappers (
$enable_haproxy_wrapper = false, $enable_haproxy_wrapper = false,
@ -98,7 +98,7 @@ class tripleo::profile::base::neutron::l3_agent_wrappers (
$enable_dibbler_wrapper = false, $enable_dibbler_wrapper = false,
$dibbler_process_wrapper = undef, $dibbler_process_wrapper = undef,
$dibbler_image = undef, $dibbler_image = undef,
$bind_sockets = hiera('tripleo::profile::base::docker::additional_sockets', ['/run/docker.sock']), $bind_sockets = hiera('docker_additional_sockets', ['/var/lib/openstack/docker.sock']),
) { ) {
unless $bind_sockets { unless $bind_sockets {
fail('The wrappers require a domain socket for accessing the docker daemon') fail('The wrappers require a domain socket for accessing the docker daemon')