Commit 0cfff1b7 authored by Victor Penso's avatar Victor Penso
Browse files

adjust to nwe autofs syntax in sys cookbook; small naming issues in client configuration

parent 471fd8aa
......@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
node.default[:sys][:autofs][:master][:'/cvmfs'][:map] = '/etc/auto.cvmfs'
node.default[:sys][:autofs][:maps][:'/cvmfs'][:map] = '/etc/auto.cvmfs'
include_recipe 'sys::autofs'
# Make sure the CMVFS user can use FUSE
......@@ -54,11 +54,16 @@ directory '/etc/cvmfs/config.d'
# Each repository needs its configuration file
unless node.cvmfs.client.config_d.empty?
node.cvmfs.client.config_d.each do |repo,config|
template "/etc/cvmfs/config.d/#{repo}.local" do
source 'etc_cvmfs_config.d_generic.local.erb'
config['http_proxy'] = 'DIRECT' unless config.has_key? 'http_proxy'
template "/etc/cvmfs/config.d/#{repo}.conf" do
source 'etc_cvmfs_config.d_generic.conf.erb'
mode "0644"
variables( :repo => repo, :config => config )
end
end
end
# /etc/cvmfs/config.d/<%= @repo %>.local
#
# DO NOT CHANGE THIS FILE MANUALLY!
#
# This file is managed by the Chef `cvmfs::client` cookbook.
<% @config.each do |key,value| %>
CVMFS_<%= key.upcase %>="<%= value %>"
<% end %>
......@@ -4,7 +4,7 @@
#
# This file is managed by the Chef `cvmfs::client` cookbook.
CVMFS_REPOSITORIES=<%= @repos.join(',') %>
CVMFS_REPOSITORIES="<%= @repos.join(',') %>"
<% @config.each do |key,value| %>
CVMFS_<%= key.upcase %>=<%= value %>
<% end %>
......@@ -6,12 +6,12 @@ default_attributes(
"client" => {
"config_d" => {
"alpha.devops.test" => {
"server_url" => "http://lxfs01.devops.test/cvmfs/@org@",
"server_url" => "http://lxfs01.devops.test/cvmfs/alpha.devops.test",
"http_proxy" => "DIRECT",
"public_key" => "/etc/cvmfs/keys/alpha.devops.test.pub"
},
"betta.devops.test" => {
"server_url" => "http://lxfs02.devops.test/cvmfs/@org@",
"server_url" => "http://lxfs02.devops.test/cvmfs/betta.devops.test",
"public_key" => "/etc/cvmfs/keys/betta.devops.test.pub"
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment