Merge pull request #228 from Esri/v3.4.0

Release v3.4.0
Esri · Jun 27, 2019 · 4f08b41 · 4f08b41
2 parents 37a2bc5 + 271c155
commit 4f08b41
Show file tree

Hide file tree

Showing 63 changed files with 634 additions and 211 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,5 @@ build
 
 # Build Files #
 .gradle/
+berks-cookbooks/
+cookbooks/arcgis/Berksfile.lock
diff --git a/cookbooks/arcgis-desktop/.kitchen.ec2.yml b/cookbooks/arcgis-desktop/.kitchen.ec2.yml
@@ -44,7 +44,6 @@ suites:
       - recipe[arcgis-desktop]
     attributes:
       arcgis:
-        version: '10.6.1'
         desktop:
           software_class: 'Viewer'
           seat_preference: 'Fixed'
@@ -63,4 +62,4 @@ suites:
       - recipe[arcgis-desktop::licensemanager]
     attributes:
       arcgis:
-        version: '10.6.1'
+        version: '10.7.1'
diff --git a/cookbooks/arcgis-desktop/CHANGELOG.md b/cookbooks/arcgis-desktop/CHANGELOG.md
@@ -3,6 +3,11 @@ arcgis-desktop cookbook CHANGELOG
 
 This file is used to list changes made in each version of the arcgis-desktop cookbook.
 
+3.4.0
+-----
+- Added support for ArcGIS 10.7.1.
+- Updated and locked versions of depenent cookbooks.
+
 3.3.0
 -----
 - Added support for ArcGIS 10.7.

diff --git a/cookbooks/arcgis-desktop/README.md b/cookbooks/arcgis-desktop/README.md
@@ -13,6 +13,7 @@ Requirements
 * 10.6
 * 10.6.1
 * 10.7
+* 10.7.1
 
 ### Supported ArcGIS software
 
@@ -27,6 +28,7 @@ Requirements
 * Windows Server 2008 (R2)
 * Windows Server 2012 (R2)
 * Windows Server 2016
+* Windows Server 2019
 
 ### Dependencies
 The following cookbooks are required:

diff --git a/cookbooks/arcgis-desktop/attributes/default.rb b/cookbooks/arcgis-desktop/attributes/default.rb
@@ -20,7 +20,7 @@
 
 default['arcgis']['run_as_user'] = 'arcgis'
 default['arcgis']['run_as_password'] = 'Pa$$w0rdPa$$w0rd'
-default['arcgis']['version'] = '10.7'
+default['arcgis']['version'] = '10.7.1'
 
 case node['platform']
 when 'windows'

diff --git a/cookbooks/arcgis-desktop/attributes/desktop.rb b/cookbooks/arcgis-desktop/attributes/desktop.rb
@@ -38,6 +38,10 @@
     desktop['authorization_file_version'] = node['arcgis']['version'].to_f.to_s
 
     case node['arcgis']['version']
+    when '10.7.1'
+      desktop['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                             'ArcGIS_Desktop_1071_169506.exe').gsub('/', '\\')
+      desktop['product_code'] = '{69262D87-3697-492B-ABED-765DDC15118B}'
     when '10.7'
       desktop['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                              'ArcGIS_Desktop_107_167519.exe').gsub('/', '\\')

diff --git a/cookbooks/arcgis-desktop/metadata.rb b/cookbooks/arcgis-desktop/metadata.rb
@@ -4,11 +4,11 @@
 license          'Apache 2.0'
 description      'Installs and configures ArcGIS Desktop'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '3.3.0'
+version          '3.4.0'
 
-depends          'arcgis-repository'
-depends          'windows'
-depends          'limits'
+depends          'arcgis-repository', '~> 3.4'
+depends          'windows', '~> 5.3'
+depends          'limits', '~> 1.0'
 
 supports         'windows'
 

diff --git a/cookbooks/arcgis-egdb/.kitchen.ec2.yml b/cookbooks/arcgis-egdb/.kitchen.ec2.yml
@@ -45,7 +45,6 @@ suites:
       prebuilt_postgresql:
         version: 9.6.9
       arcgis:
-        version: '10.7'
         server:
           authorization_file: '/auth_files/ArcGIS_Server/Advanced/Server_Ent_Adv.ecp'
         egdb:

diff --git a/cookbooks/arcgis-egdb/CHANGELOG.md b/cookbooks/arcgis-egdb/CHANGELOG.md
@@ -1,7 +1,11 @@
 arcgis-egdb cookbook CHANGELOG
 ================================
 
-This file is used to list changes made in each version of the arcgis-eegdb cookbook.
+This file is used to list changes made in each version of the arcgis-egdb cookbook.
+
+1.0.1
+-----
+- Updated and locked versions of dependent cookbooks.
 
 1.0.0
 -----

diff --git a/cookbooks/arcgis-egdb/README.md b/cookbooks/arcgis-egdb/README.md
@@ -10,10 +10,11 @@ arcgis-egdb cookbook creates enterprise geodatabases in SQL Server or PostgreSQL
 * Windows Server 2008 (R2)
 * Windows Server 2012 (R2)
 * Windows Server 2016
-* Ubuntu 14.04/16.04
-* Rhel 6.5, 7.0
+* Windows Server 2019
+* Ubuntu 14.04, 16.04, 18.04
+* RHEL 6.5, 7.0
 
-## Database Servers 
+## Database Servers
 
 The cookbook was tested with:
 

diff --git a/cookbooks/arcgis-egdb/metadata.rb b/cookbooks/arcgis-egdb/metadata.rb
@@ -4,10 +4,10 @@
 license 'Apache 2.0'
 description 'Creates enterprise geodatabases in SQL Server or PostgreSQL DBMS and registers them with ArcGIS Server.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '1.0.0'
+version '1.0.1'
 chef_version '>= 12.6', '< 15.0' if defined? chef_version
 
-depends    'arcgis-enterprise'
+depends    'arcgis-enterprise', '~> 3.4'
 
 supports   'windows'
 supports   'ubuntu'

diff --git a/cookbooks/arcgis-enterprise/CHANGELOG.md b/cookbooks/arcgis-enterprise/CHANGELOG.md
@@ -3,10 +3,10 @@ arcgis-enterprise cookbook CHANGELOG
 
 This file is used to list changes made in each version of the arcgis-enterprise cookbook.
 
-3.3.1
+3.4.0
 -----
-- Workaround for [BUG-000121142](https://support.esri.com/en/technical-article/000020633)
-- Increased configuredatastore tool execution timeout to 3 hours.
+- Added support for ArcGIS Enterprise 10.7.1.
+- Updated and locked versions of depenent cookbooks.
 
 3.3.0
 -----

diff --git a/cookbooks/arcgis-enterprise/README.md b/cookbooks/arcgis-enterprise/README.md
@@ -9,6 +9,7 @@ Requirements
 ### Supported ArcGIS versions
 
 * 10.7
+* 10.7.1
 
 ### Supported ArcGIS software
 
@@ -25,7 +26,8 @@ Requirements
 * Windows Server 2008 (R2)
 * Windows Server 2012 (R2)
 * Windows Server 2016
-* Ubuntu 14.04, 16.04
+* Windows Server 2019
+* Ubuntu 14.04, 16.04, 18.04
 * Rhel 6.5, 7.0
 
 ### Dependencies
@@ -133,6 +135,7 @@ Portal for ArcGIS, and ArcGIS Data Store. Default value is`Pa$$w0rdPa$$w0rd`.
 * `node['arcgis']['portal']['install_dir']` = Portal for ArcGIS installation directory. By default, Portal for ArcGIS is installed to `%ProgramW6432%\ArcGIS\Portal` on Windows machines and `/` on Linux machines.
 * `node['arcgis']['portal']['install_system_requirements']` = If set to true, the required third party libraries are installed on the machine before running Portal for ArcGIS setup. Default value is `true`.
 * `node['arcgis']['portal']['configure_autostart']` = If set to true, on Linux the Portal for ArcGIS is configured to start with the operating system. Default value is `true`.
+* `node['arcgis']['portal']['data_dir']` = Data directory path used by Portal for ArcGIS setup. The path must be a local directory, not a shared network directory. Dafault path on Windows is `C:\arcgisportal`, on Linux is `/arcgis/portal/usr/arcgisportal/`.
 * `node['arcgis']['portal']['content_dir']` = Portal for ArcGIS content directory. Default directory is `C:\arcgisportal\content` on Windows and `/arcgis/portal/usr/arcgisportal/content` on Linux.
 * `node['arcgis']['portal']['authorization_file']` = Portal for ArcGIS authorization file path. Default location and file name is `C:\Temp\portal_license.prvc` on Windows and `/tmp/portal_license.prvc` on Linux.
 * `node['arcgis']['portal']['authorization_file_version']` = Portal for ArcGIS authorization file version. Default value is `10.4`.
@@ -158,6 +161,11 @@ Portal for ArcGIS, and ArcGIS Data Store. Default value is`Pa$$w0rdPa$$w0rd`.
 * `node['arcgis']['portal']['security']['user_store_config']` = User store configuration. Default value is `{'type' => 'BUILTIN', 'properties' => {}}`
 * `node['arcgis']['portal']['security']['role_store_config']` = Role store configuration. Default value is `{'type' => 'BUILTIN', 'properties' => {}}`
 
+#### Web Styles
+
+* `node['arcgis']['webstyles']['setup']` = ArcGIS Web Styles setup path.
+* `node['arcgis']['webstyles']['setup_archive']` = ArcGIS Web Styles setup archive path. Default value depends on `node['arcgis']['version']` attribute value.
+
 #### Data Store
 
 * `node['arcgis']['data_store']['data_dir']` = ArcGIS Data Store data directory. Default location is `C:\arcgisdatastore` on Windows and `/arcgis/datastore/usr/arcgisdatastore` on Linux.
@@ -340,6 +348,10 @@ Unregisters all unavailable server machines in 'default' cluster from the ArcGIS
 
 Checks if ArcGIS Enterprise setups and authorization files exist.
 
+### arcgis-enterprise::webstyles
+
+Installs Portal for ArcGIS Web Styles.
+
 Usage
 -----
 

diff --git a/cookbooks/arcgis-enterprise/attributes/datastore.rb b/cookbooks/arcgis-enterprise/attributes/datastore.rb
@@ -43,6 +43,10 @@
     data_store['data_dir'] = 'C:\\arcgisdatastore'
 
     case node['arcgis']['version']
+    when '10.7.1'
+      data_store['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                'ArcGIS_DataStore_Windows_1071_169689.exe').gsub('/', '\\')
+      data_store['product_code'] = '{112E5FD0-9DD2-45DA-ACD5-A21AA45F67E2}'
     when '10.7'
       data_store['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                 'ArcGIS_DataStore_Windows_107_167633.exe').gsub('/', '\\')
@@ -86,6 +90,9 @@
     data_store['lp-setup'] = node['arcgis']['data_store']['setup']
 
     case node['arcgis']['version']
+    when '10.7.1'
+      data_store['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                'ArcGIS_DataStore_Linux_1071_169808.tar.gz')
     when '10.7'
       data_store['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                 'ArcGIS_DataStore_Linux_107_167719.tar.gz')

diff --git a/cookbooks/arcgis-enterprise/attributes/default.rb b/cookbooks/arcgis-enterprise/attributes/default.rb
@@ -25,7 +25,7 @@
   default['arcgis']['run_as_password'] = ENV['ARCGIS_RUN_AS_PASSWORD']
 end
 
-default['arcgis']['version'] = '10.7'
+default['arcgis']['version'] = '10.7.1'
 
 default['arcgis']['cache_authorization_files'] = false
 default['arcgis']['configure_windows_firewall'] = false
@@ -42,7 +42,7 @@
 else # node['platform'] == 'linux'
   default['arcgis']['packages'] =
     case node['platform']
-    when 'redhat', 'centos'
+    when 'redhat', 'centos', 'amazon'
       ['gettext']
     when 'suse'
       ['gettext-runtime']

diff --git a/cookbooks/arcgis-enterprise/attributes/portal.rb b/cookbooks/arcgis-enterprise/attributes/portal.rb
@@ -77,8 +77,7 @@
   portal['configure_autostart'] = true
   portal['install_system_requirements'] = true
 
-  # authorization_file_version must be <major>.<minor> ('10.4.1' -> '10.4')
-  portal['authorization_file_version'] = node['arcgis']['version'].to_f.to_s
+  portal['authorization_file_version'] = node['arcgis']['version']
   portal['user_license_type_id'] = ''
 
   portal['security']['user_store_config'] = {'type' => 'BUILTIN', 'properties' => {}}
@@ -105,6 +104,10 @@
     portal['data_dir'] = 'C:\\arcgisportal'
 
     case node['arcgis']['version']
+    when '10.7.1'
+      portal['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                            'Portal_for_ArcGIS_Windows_1071_169688.exe').gsub('/', '\\')
+      portal['product_code'] = '{7FDEEE00-6641-4E27-A54E-82ACCCE14D00}'
     when '10.7'
       portal['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                             'Portal_for_ArcGIS_Windows_107_167632.exe').gsub('/', '\\')
@@ -178,6 +181,9 @@
     portal['lp-setup'] = node['arcgis']['server']['setup']
 
     case node['arcgis']['version']
+    when '10.7.1'
+      portal['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                            'Portal_for_ArcGIS_Linux_1071_169807.tar.gz')
     when '10.7'
       portal['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                             'Portal_for_ArcGIS_Linux_107_167718.tar.gz')

diff --git a/cookbooks/arcgis-enterprise/attributes/server.rb b/cookbooks/arcgis-enterprise/attributes/server.rb
@@ -104,6 +104,12 @@
     server['local_directories_root'] = 'C:\\arcgisserver'
 
     case node['arcgis']['version']
+    when '10.7.1'
+      server['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                            'ArcGIS_Server_Windows_1071_169677.exe').gsub('/', '\\')
+      server['product_code'] = '{08E03E6F-95D3-4D33-A171-E0DC996E08E3}'
+      default['arcgis']['python']['runtime_environment'] = File.join(node['arcgis']['python']['install_dir'], 
+                                                                     "ArcGISx6410.7").gsub('/', '\\')
     when '10.7'
       server['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                             'ArcGIS_Server_Windows_107_167621.exe').gsub('/', '\\')
@@ -198,6 +204,9 @@
     server['lp-setup'] = node['arcgis']['server']['setup']
 
     case node['arcgis']['version']
+    when '10.7.1'
+      server['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                            'ArcGIS_Server_Linux_1071_169796.tar.gz')
     when '10.7'
       server['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                             'ArcGIS_Server_Linux_107_167707.tar.gz')

diff --git a/cookbooks/arcgis-enterprise/attributes/webadaptor.rb b/cookbooks/arcgis-enterprise/attributes/webadaptor.rb
@@ -34,6 +34,12 @@
     web_adaptor['install_dir'] = ''
 
     case node['arcgis']['version']
+    when '10.7.1'
+      web_adaptor['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                 'Web_Adaptor_for_Microsoft_IIS_1071_169690.exe').gsub('/', '\\')
+      web_adaptor['product_code'] = '{5ECEF84F-592C-47D1-B7C5-9F3D7E2AB7CE}'
+      web_adaptor['product_code2'] = '{5F1D01EA-296E-4226-A704-6A90E2916782}'
+      web_adaptor['config_web_adaptor_exe'] = '\\ArcGIS\\WebAdaptor\\IIS\\10.7.1\\Tools\\ConfigureWebAdaptor.exe' 
     when '10.7'
       web_adaptor['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                  'Web_Adaptor_for_Microsoft_IIS_107_167634.exe').gsub('/', '\\')
@@ -93,14 +99,19 @@
                                     '{1B4E7470-72F4-4169-92B9-EF1BDF8AE4AF}',
                                     '{3FA8B44E-E0E3-4245-A662-6B81E1E75048}',
                                     '{F343B520-F769-4D93-86D2-663168AC6975}',
-                                    '{58A76431-E1A9-4D11-BB89-0D12C6E77C78}']
+                                    '{58A76431-E1A9-4D11-BB89-0D12C6E77C78}',
+                                    '{5ECEF84F-592C-47D1-B7C5-9F3D7E2AB7CE}',
+                                    '{5F1D01EA-296E-4226-A704-6A90E2916782}']
   else # node['platform'] == 'linux'
     web_adaptor['setup'] = ::File.join(node['arcgis']['repository']['setups'],
                                        node['arcgis']['version'],
                                        'WebAdaptor', 'Setup')
     web_adaptor['lp-setup'] = node['arcgis']['web_adaptor']['setup']
 
     case node['arcgis']['version']
+    when '10.7.1'
+      web_adaptor['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                 'Web_Adaptor_Java_Linux_1071_169645.tar.gz')
     when '10.7'
       web_adaptor['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                  'Web_Adaptor_Java_Linux_107_167720.tar.gz')

diff --git a/cookbooks/arcgis-enterprise/attributes/webstyles.rb b/cookbooks/arcgis-enterprise/attributes/webstyles.rb
@@ -0,0 +1,47 @@
+#
+# Cookbook Name:: arcgis-enterprise
+# Attributes:: webstyles
+#
+# Copyright 2019 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.
+
+default['arcgis']['webstyles'].tap do |webstyles|
+  case node['platform']
+  when 'windows'
+    webstyles['setup'] = ::File.join(node['arcgis']['repository']['setups'],
+                                     "ArcGIS #{node['arcgis']['version']}",
+                                     'ArcGISWebStyles', 'Setup.exe').tr('/', '\\')
+
+    case node['arcgis']['version']
+    when '10.7.1'
+      webstyles['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                               'ArcGIS_Web_Styles_Windows_1071_170272.exe').tr('/', '\\')
+      webstyles['product_code'] = '{B2E42A8D-1EE9-4610-9932-D0FCFD06D2AF}'
+    else
+      Chef::Log.warn 'Unsupported ArcGIS Web Styles version'
+    end
+  else # node['platform'] == 'linux'
+    webstyles['setup'] = ::File.join(node['arcgis']['repository']['setups'],
+                                     node['arcgis']['version'],
+                                     'WebStyles', 'WebStyles-Setup.sh')
+
+    case node['arcgis']['version']
+    when '10.7.1'
+      webstyles['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                               'ArcGIS_Web_Styles_Linux_1071_170273.tar.gz')
+    else
+      Chef::Log.warn 'Unsupported ArcGIS Web Styles version'
+    end
+  end
+end