Rename web-viewer to web_viewer

This commit is to achieve consistency with https://github.com/aws/aws-parallelcluster-cookbook/pull/1335/files Signed-off-by: Hanwen <[email protected]>
hanwen-pcluste · Jan 24, 2022 · f99ad8c · f99ad8c
1 parent b779bf6
commit f99ad8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -267,14 +267,14 @@
     'default' => "nice-dcv-gl_#{node['cluster']['dcv']['gl']['version']}_#{node['cluster']['dcv']['package_architecture_id']}.#{node['cluster']['base_os']}.deb",
   }
 )
-default['cluster']['dcv']['web-viewer']['version'] = '2021.3.11591-1'
-default['cluster']['dcv']['web-viewer'] = value_for_platform( # required to enable WEB client
+default['cluster']['dcv']['web_viewer']['version'] = '2021.3.11591-1'
+default['cluster']['dcv']['web_viewer'] = value_for_platform( # required to enable WEB client
   'centos' => {
-    '~>7' => "nice-dcv-web-viewer-#{node['cluster']['dcv']['web-viewer']['version']}.el7.#{node['cluster']['dcv']['url_architecture_id']}.rpm",
+    '~>7' => "nice-dcv-web_viewer-#{node['cluster']['dcv']['web_viewer']['version']}.el7.#{node['cluster']['dcv']['url_architecture_id']}.rpm",
   },
-  'amazon' => { '2' => "nice-dcv-web-viewer-#{node['cluster']['dcv']['web-viewer']['version']}.el7.#{node['cluster']['dcv']['url_architecture_id']}.rpm" },
+  'amazon' => { '2' => "nice-dcv-web_viewer-#{node['cluster']['dcv']['web_viewer']['version']}.el7.#{node['cluster']['dcv']['url_architecture_id']}.rpm" },
   'ubuntu' => {
-    'default' => "nice-dcv-web-viewer_#{node['cluster']['dcv']['web-viewer']['version']}_#{node['cluster']['dcv']['package_architecture_id']}.#{node['cluster']['base_os']}.deb",
+    'default' => "nice-dcv-web_viewer_#{node['cluster']['dcv']['web_viewer']['version']}_#{node['cluster']['dcv']['package_architecture_id']}.#{node['cluster']['base_os']}.deb",
   }
 )
 default['cluster']['dcv']['url'] = "https://d1uj6qtbmh3dt5.cloudfront.net/2021.3/Servers/#{node['cluster']['dcv']['package']}.tgz"

diff --git a/cookbooks/aws-parallelcluster-install/recipes/dcv.rb b/cookbooks/aws-parallelcluster-install/recipes/dcv.rb
@@ -196,8 +196,8 @@ def disable_lock_screen
     end
   end
 
-  # Install server, xdcv and web-viewer packages
-  dcv_packages = %W(#{node['cluster']['dcv']['server']} #{node['cluster']['dcv']['xdcv']} #{node['cluster']['dcv']['web-viewer']})
+  # Install server, xdcv and web_viewer packages
+  dcv_packages = %W(#{node['cluster']['dcv']['server']} #{node['cluster']['dcv']['xdcv']} #{node['cluster']['dcv']['web_viewer']})
   dcv_packages_path = "#{node['cluster']['sources_dir']}/#{node['cluster']['dcv']['package']}/"
   # Rewrite dcv_packages object by cycling each package file name and appending the path to them
   dcv_packages.map! { |package| dcv_packages_path + package }