From 3b6c90ad7044e1c13e6028071e3ec54845aa0105 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 7 May 2018 13:23:22 -0700 Subject: [PATCH] Neutron wrappers: lookup for THT parameter 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 --- manifests/profile/base/neutron/dhcp_agent_wrappers.pp | 4 ++-- manifests/profile/base/neutron/l3_agent_wrappers.pp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/profile/base/neutron/dhcp_agent_wrappers.pp b/manifests/profile/base/neutron/dhcp_agent_wrappers.pp index c3975be53..b8ad8bdd7 100644 --- a/manifests/profile/base/neutron/dhcp_agent_wrappers.pp +++ b/manifests/profile/base/neutron/dhcp_agent_wrappers.pp @@ -49,7 +49,7 @@ # [*bind_sockets*] # (Optional) Domain sockets that the wrappers should use for accessing # 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 ( $enable_dnsmasq_wrapper = false, @@ -58,7 +58,7 @@ class tripleo::profile::base::neutron::dhcp_agent_wrappers ( $enable_haproxy_wrapper = false, $haproxy_process_wrapper = 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 { fail('The wrappers require a domain socket for accessing the docker daemon') diff --git a/manifests/profile/base/neutron/l3_agent_wrappers.pp b/manifests/profile/base/neutron/l3_agent_wrappers.pp index 1c1701323..cfe2d2388 100644 --- a/manifests/profile/base/neutron/l3_agent_wrappers.pp +++ b/manifests/profile/base/neutron/l3_agent_wrappers.pp @@ -82,7 +82,7 @@ # [*bind_sockets*] # (Optional) Domain sockets that the wrappers should use for accessing # 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 ( $enable_haproxy_wrapper = false, @@ -98,7 +98,7 @@ class tripleo::profile::base::neutron::l3_agent_wrappers ( $enable_dibbler_wrapper = false, $dibbler_process_wrapper = 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 { fail('The wrappers require a domain socket for accessing the docker daemon')