Merge pull request #315 from Esri/v4.0.0

Release v4.0.0

README.md

@@ -32,7 +32,7 @@ Included ArcGIS deployment templates:
 * [arcgis-notebook-server](templates/arcgis-notebook-server) - deploys [ArcGIS Notebook Server](https://enterprise.arcgis.com/en/notebook/) with an ArcGIS Enterprise deployment.
 * [arcgis-portal](templates/arcgis-portal) - deploys [Portal for ArcGIS](https://enterprise.arcgis.com/en/portal/).
 * [arcgis-pro](templates/arcgis-pro) - deploys [ArcGIS Pro](https://www.esri.com/en-us/arcgis/products/arcgis-pro/overview).
-* [arcgis-server](templates/arcgis-server) - deploys ArcGIS Server in GIS Server, ArcGIS GeoAnalytics Server, Raster Analytics Server or Image Server roles and federates it with Portal for ArcGIS.
+* [arcgis-server](templates/arcgis-server) - deploys ArcGIS Server in GIS Server, ArcGIS GeoAnalytics Server, Raster Analytics Server, Image Server, or Knowledge Server roles and federates it with Portal for ArcGIS.
 * [arcgis-webadaptor](templates/arcgis-webadaptor) - deploys [ArcGIS Web Adaptor](https://enterprise.arcgis.com/en/server/latest/install/windows/about-the-arcgis-web-adaptor.htm).
 * [arcgis-workflow-manager](templates/arcgis-workflow-manager) - deploys [ArcGIS Workflow Manager Server](https://enterprise.arcgis.com/en/workflow/).
 

cookbooks/arcgis-desktop/CHANGELOG.md

@@ -3,6 +3,10 @@ arcgis-desktop cookbook CHANGELOG
 
 This file is used to list changes made in each version of the arcgis-desktop cookbook.
 
+4.0.0
+-----
+- Added support for ArcGIS License Manager 2022.0
+
 3.8.0
 -----
 - Added support for ArcGIS Desktop 10.8.2 and ArcGIS License Manager 2021.0/2021.1

cookbooks/arcgis-desktop/README.md

@@ -1,12 +1,17 @@
-arcgis-desktop cookbook
-===============
+---
+layout: default
+title: "arcgis-desktop cookbook"
+category: cookbooks
+item: arcgis-desktop
+version: 4.0.0
+latest: true
+---
 
-This cookbook installs and configures ArcGIS Desktop and ArcGIS License Manager.
+# arcgis-desktop cookbook
 
-Requirements
-------------
+This cookbook installs and configures ArcGIS Desktop and ArcGIS License Manager.
 
-### Supported ArcGIS software
+## Supported ArcGIS software
 
 * ArcGIS Desktop (Windows only)
    * 10.4
@@ -31,8 +36,9 @@ Requirements
    * 2020.1
    * 2021.0
    * 2021.1
+   * 2022.0
 
-### Platforms
+## Platforms
 
 * Windows 10
 * Windows Server 2012 (R2)
@@ -44,15 +50,14 @@ Requirements
 
 ArcGIS Desktop is supported only on Windows platforms.
 
-### Dependencies
+## Dependencies
 
 The following cookbooks are required:
 
 * windows
 * arcgis-repository
 
-Attributes
-----------
+## Attributes
 
 * `node['arcgis']['version']` = ArcGIS Desktop version. Default value is `10.8.1`.
 * `node['arcgis']['desktop']['setup_archive']` = The location of ArcGIS Desktop setup archive. Default value depends on `node['arcgis']['version']` attribute value.
@@ -63,61 +68,140 @@ Attributes
 * `node['arcgis']['desktop']['authorization_file']` = ArcGIS Desktop authorization file path. Default location and file name are `C:\\Temp\\license.prvc`.
 * `node['arcgis']['desktop']['authorization_file_version']` = ArcGIS Desktop authorization file version. Default value is `10.8`.
 * `node['arcgis']['desktop']['esri_license_host']` = Hostname of ArcGIS License Manager. Default hostname is `%COMPUTERNAME%`.
-* `node['arcgis']['desktop']['software_class']` = ArcGIS Desktop software class <Viewer|Editor|Professional>. Default value is `Viewer`.
-* `node['arcgis']['desktop']['seat_preference']` = ArcGIS Desktop license seat preference <Fixed|Float>. Default value is `Fixed`.
-* `node['arcgis']['licensemanager']['version']` = ArcGIS License Manager version. Default value is `2021.1`.
+* `node['arcgis']['desktop']['software_class']` = ArcGIS Desktop software class `<Viewer|Editor|Professional>`. Default value is `Viewer`.
+* `node['arcgis']['desktop']['seat_preference']` = ArcGIS Desktop license seat preference `<Fixed|Float>`. Default value is `Fixed`.
+* `node['arcgis']['licensemanager']['version']` = ArcGIS License Manager version. Default value is `2022.0`.
 * `node['arcgis']['licensemanager']['setup_archive']` = The location of ArcGIS License Manager setup archive. Default value depends on `node['arcgis']['version']` attribute value.
-* `node['arcgis']['licensemanager']['setup']` = The location of ArcGIS License Manager setup executable. Default location is `%USERPROFILE%\Documents\ArcGIS License Manager 2021.0\LicenseManager\Setup.exe` on Windows, and `/opt/arcgis/2021.1/LicenseManager_Linux/Setup` on Linux.
+* `node['arcgis']['licensemanager']['setup']` = The location of ArcGIS License Manager setup executable. Default location is `%USERPROFILE%\Documents\ArcGIS License Manager 2022.0\LicenseManager\Setup.exe` on Windows, and `/opt/arcgis/2022.0/LicenseManager_Linux/Setup` on Linux.
 * `node['arcgis']['licensemanager']['lp-setup']` = The location of language pack for ArcGIS License Manager. Default location is `C:\ArcGIS\LicenseManager\SetupFiles\setup.msi`.
 * `node['arcgis']['licensemanager']['install_dir']` = ArcGIS License Manager installation directory. By default, the license manager is installed to `%ProgramFiles(x86)%\ArcGIS` on Windows and `/` on Linux.
 
-Recipes
--------
-### arcgis-desktop::default
+## Recipes
+
+### default
 
 Installs and configures ArcGIS Desktop.
 
-### arcgis-desktop::licensemanager
+Attributes used by the recipe:
+
+```JSON
+{
+  "arcgis": {
+    "version": "10.8.2",
+    "desktop": {
+      "setup": "C:\\ArcGIS\\10.8.2\\Desktop\\Setup.exe",
+      "install_dir": "C:\\Program Files (x86)\\ArcGIS",
+      "authorization_file": "C:\\ArcGIS\\10.8\\Authorization_Files\\DTBasic.prvc",
+      "authorization_file_version": "10.8",
+      "install_features": "ALL",
+      "software_class": "Viewer",
+      "seat_preference": "Fixed",
+      "desktop_config": true,
+      "modifyflexdacl": false
+    },
+    "python": {
+      "install_dir": "C:\\Python27"
+    }
+  },
+  "run_list":[
+    "recipe[arcgis-desktop]"
+  ]
+}
+```
+
+> Software authorization for ArcGIS Desktop is only supported by the cookbook when the "seat_preference" attribute value is "Fixed".
+
+> Chef cookbook [ms_dotnet](https://supermarket.chef.io/cookbooks/ms_dotnet/) could be used to install the .Net Framework version required by ArcGIS for Desktop. 
+
+For example:
+
+```JSON
+{
+  "ms_dotnet" : {
+    "v4" : {
+      "version" : "4.5.1"
+    }
+  },
+  "run_list":[
+    "recipe[ms_dotnet::ms_dotnet4]"
+  ]
+}
+```
+
+### licensemanager
 
 Installs and configures ArcGIS License Manager.
 
-### arcgis-desktop::lp-install
-
-Installs language packs for ArcGIS Desktop and ArcGIS License Manager.
-
-### arcgis-desktop::uninstall
-
-Uninstalls ArcGIS Desktop and ArcGIS License Manager.
-
-Usage
------
-See [wiki](https://github.com/Esri/arcgis-cookbook/wiki) pages for more information about using ArcGIS cookbooks.
-
-## Issues
-
-Find a bug or want to request a new feature?  Please let us know by submitting an [issue](https://github.com/Esri/arcgis-cookbook/issues).
-
-## Contributing
-
-Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](https://github.com/esri/contributing).
-
-Licensing
----------
-
-Copyright 2021 Esri
-
-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.
-
-A copy of the license is available in the repository's [License.txt](https://github.com/Esri/arcgis-cookbook/blob/master/License.txt?raw=true) file.
-
-[](Esri Tags: ArcGIS Desktop Chef Cookbook)
-[](Esri Language: Ruby)
+Attributes used by the recipe:
+
+```JSON
+{
+  "arcgis": {
+    "run_as_user": "arcgis",
+    "repository": {
+       "archives": "C:\\Software\\Esri",
+       "setups": "C:\\Software\\Setups" 
+    },
+    "licensemanager": {
+      "version": "2022.0",
+      "setup": "C:\\Software\\Setups\\License Manager 2022.0\\LicenseManager\\Setup.exe",
+      "install_dir": "C:\\Program Files (x86)\\ArcGIS"
+    }
+  },
+  "run_list":[
+    "recipe[arcgis-desktop::licensemanager]"
+  ]
+}
+```
+
+:grey_exclamation: run_as_user attribute is ignored on Windows.
+
+### lp-install
+
+Installs and configures language packs for ArcGIS Desktop and ArcGIS License Manager.
+
+Attributes used by the recipe:
+```JSON
+{
+  "arcgis": {
+    "version": "10.8.2",
+    "desktop": {
+      "lp-setup": "C:\\ArcGIS\\10.8.2\\Desktop\\Japanese\\Setup.exe"
+    },
+    "licensemanager": {
+      "lp-setup": "C:\\ArcGIS\\10.8.2\\LicenseManager\\Japanese\\Setup.exe"
+    }
+  },
+  "run_list":[
+    "recipe[arcgis-desktop::lp-install]"
+  ]
+}
+```
+
+:exclamation: Currently lp-install recipe is supported on Windows only.
+
+### uninstall
+
+Uninstalls ArcGIS Desktop and ArcGIS License Manager of the specified ArcGIS version.
+
+Attributes used by the recipe:
+
+```JSON
+{
+  "arcgis": {
+    "version": "10.8.2",
+    "run_as_user": "arcgis",
+    "desktop": {
+      "install_dir": "C:\\Program Files (x86)\\ArcGIS"
+    },
+    "licensemanager": {
+      "install_dir": "C:\\Program Files (x86)\\ArcGIS"
+    }
+  },
+  "run_list":[
+    "recipe[arcgis-desktop::uninstall]"
+  ]
+}
+```
+
+> The arcgis.run_as_user attribute is ignored on Windows.

cookbooks/arcgis-desktop/attributes/licensemanager.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: arcgis-desktop
 # Attributes:: licensemanager
 #
-# Copyright 2021 Esri
+# Copyright 2022 Esri
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 # limitations under the License.
 
 default['arcgis']['licensemanager'].tap do |licensemanager|
-  licensemanager['version'] = '2021.1'
+  licensemanager['version'] = '2022.0'
 
   case node['platform']
   when 'windows'
@@ -28,6 +28,10 @@
     licensemanager['install_dir'] = ENV['ProgramFiles(x86)'] + '\\ArcGIS'
 
     case node['arcgis']['licensemanager']['version']
+    when '2022.0'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Windows_2022_0_182116.exe').gsub('/', '\\')
+      licensemanager['product_code'] = '{A3AC9C93-E045-4CAE-AAE4-F62A8E669E02}'
     when '2021.1'
       licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                     'ArcGIS_License_Manager_Windows_2021_1_180127.exe').gsub('/', '\\')
@@ -90,6 +94,9 @@
     licensemanager['install_subdir'] = 'arcgis/license' + node['arcgis']['licensemanager']['version']
 
     case node['arcgis']['licensemanager']['version']
+    when '2022.0'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Linux_2022_0_182145.tar.gz')
     when '2021.1'
       licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                     'ArcGIS_License_Manager_Linux_2021_1_180145.tar.gz')      

cookbooks/arcgis-desktop/metadata.rb

@@ -4,10 +4,10 @@
 license          'Apache 2.0'
 description      'Installs and configures ArcGIS Desktop and ArcGIS License Manager'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '3.8.0'
-chef_version     '>= 13.0' if defined? chef_version
+version          '4.0.0'
+chef_version     '>= 14.0' if defined? chef_version
 
-depends          'arcgis-repository', '~> 3.8'
+depends          'arcgis-repository', '~> 4.0'
 depends          'windows', '~> 5.3'
 depends          'limits', '~> 1.0'