Merge pull request #48 from Esri/v2.2.1

V2.2.1

.kitchen.yml

@@ -119,4 +119,4 @@ suites:
     excludes:
       - windows-2012r2
       - windows-2008r2
-      - windows-81
+      - windows-81

CHANGELOG.md

@@ -3,6 +3,10 @@ arcgis cookbook CHANGELOG
 
 This file is used to list changes made in each version of the arcgis cookbook.
 
+2.2.1
+-----
+- ArcGIS 10.4.1 support.
+
 2.2.0
 -----
 - This version supports only ArcGIS 10.4 release software. (Use 1.1.3 version with ArcGIS software 10.3.1 release.)
@@ -29,4 +33,4 @@ This file is used to list changes made in each version of the arcgis cookbook.
 
 1.1.1
 -----
-- Initial release of arcgis cookbook
+- Initial release of arcgis cookbook 

README.md

@@ -7,15 +7,14 @@ Requirements
 ------------
 
 ### Supported ArcGIS software
-* ArcGIS 10.4 Server
-* ArcGIS 10.4 Data Store
-* Portal for ArcGIS 10.4
-* ArcGIS 10.4 Web Adaptor (IIS/Java) 
-* ArcGIS 10.4 GeoEvent Extension for Server
+* ArcGIS 10.4/10.4.1 Server
+* ArcGIS 10.4/10.4.1 Data Store
+* Portal for ArcGIS 10.4/10.4.1
+* ArcGIS 10.4/10.4.1 Web Adaptor (IIS/Java) 
+* ArcGIS 10.4/10.4.1 GeoEvent Extension for Server
+* ArcGIS 10.4/10.4.1 for Desktop (Windows only)
+* ArcGIS 10.4/10.4.1 License Manager 
 * ArcGIS Pro 1.1/1.2 (Windows only)
-* ArcGIS 10.4 for Desktop (Windows only)
-* ArcGIS 10.4 License Manager 
-
 
 ### Platforms
 * Windows 7

attributes/default.rb

@@ -128,10 +128,6 @@
   default['arcgis']['licensemanager']['setup'] = 'C:\\Temp\\ArcGISLicenseManager\\Setup.exe'
   default['arcgis']['licensemanager']['install_dir'] = ENV['ProgramFiles(x86)'] + '\\ArcGIS'
 
-  default['arcgis']['geoevent']['authorization_file'] = ''
-  default['arcgis']['geoevent']['authorization_file_version'] = node['arcgis']['server']['authorization_file_version']
-  default['arcgis']['geoevent']['setup'] = 'C:\\Temp\\ArcGIS_GeoEventExtension\\setup.exe'
-
   if node['platform_version'].to_f < 6.1
     # Windows Server 2008
     default['arcgis']['iis']['features'] = ['Web-Server', 'Web-Mgmt-Tools', 'Web-Mgmt-Console',
@@ -169,19 +165,40 @@
   # default['arcgis']['iis']['keystore_file'] = nil
   # default['arcgis']['iis']['keystore_password'] = nil
 
-  default['arcgis']['server']['product_code'] = '{687897C7-4795-4B17-8AD0-CB8C364778AD}'
-  default['arcgis']['geoevent']['product_code'] = '{188191AE-5A83-49E8-88CB-1F1DB05F030D}'
-  default['arcgis']['portal']['product_code'] = '{FA6FCD2D-114C-4C04-A8DF-C2E43979560E}'
-  default['arcgis']['web_adaptor']['product_code'] = '{B83D9E06-B57C-4B26-BF7A-004BE10AB2D5}'
-  default['arcgis']['web_adaptor']['product_code2'] = '{E2C783F3-6F85-4B49-BFCD-6D6A57A2CFCE}'
-  default['arcgis']['data_store']['product_code'] = '{C351BC6D-BF25-487D-99AB-C963D590A8E8}'
-  default['arcgis']['desktop']['product_code'] = '{72E7DF0D-FFEE-43CE-A5FA-43DFC25DC087}'
-  default['arcgis']['licensemanager']['product_code'] = '{E1393226-725C-42F8-A672-4E5AC55EFBDE}'
-
-  default['arcgis']['server']['authorization_file_version'] = node['arcgis']['version']
-  default['arcgis']['portal']['authorization_file_version'] = node['arcgis']['version']
-  default['arcgis']['desktop']['authorization_file_version'] = node['arcgis']['version']
+  case node['arcgis']['version']
+  when '10.4.1'
+    default['arcgis']['server']['product_code'] = '{88A617EF-89AC-418E-92E1-926908C4D50F}'
+    default['arcgis']['geoevent']['product_code'] = '{D71379AF-A72B-4B10-A7BA-64BC6AF6841B}'
+    default['arcgis']['portal']['product_code'] = '{31373E04-9B5A-4CD7-B668-0B1DE7F0D45F}'
+    default['arcgis']['web_adaptor']['product_code'] = '{F53FEE2B-54DD-4A6F-8545-6865F4FBF6DC}'
+    default['arcgis']['web_adaptor']['product_code2'] = '{475ACDE5-D140-4F10-9006-C804CA93D2EF}'
+    default['arcgis']['data_store']['product_code'] = '{A944E0A7-D268-41CA-B96E-8434457B051B}'
+    default['arcgis']['desktop']['product_code'] = '{CB0C9578-75CB-45E5-BD81-A600BA33B0C3}'
+    default['arcgis']['licensemanager']['product_code'] = '{D71379AF-A72B-4B10-A7BA-64BC6AF6841B}'
+
+    default['arcgis']['server']['authorization_file_version'] = '10.4'
+    default['arcgis']['portal']['authorization_file_version'] = '10.4'
+    default['arcgis']['desktop']['authorization_file_version'] = '10.4'
+  when '10.4'
+    default['arcgis']['server']['product_code'] = '{687897C7-4795-4B17-8AD0-CB8C364778AD}'
+    default['arcgis']['geoevent']['product_code'] = '{188191AE-5A83-49E8-88CB-1F1DB05F030D}'
+    default['arcgis']['portal']['product_code'] = '{FA6FCD2D-114C-4C04-A8DF-C2E43979560E}'
+    default['arcgis']['web_adaptor']['product_code'] = '{B83D9E06-B57C-4B26-BF7A-004BE10AB2D5}'
+    default['arcgis']['web_adaptor']['product_code2'] = '{E2C783F3-6F85-4B49-BFCD-6D6A57A2CFCE}'
+    default['arcgis']['data_store']['product_code'] = '{C351BC6D-BF25-487D-99AB-C963D590A8E8}'
+    default['arcgis']['desktop']['product_code'] = '{72E7DF0D-FFEE-43CE-A5FA-43DFC25DC087}'
+    default['arcgis']['licensemanager']['product_code'] = '{E1393226-725C-42F8-A672-4E5AC55EFBDE}'
+
+    default['arcgis']['server']['authorization_file_version'] = node['arcgis']['version']
+    default['arcgis']['portal']['authorization_file_version'] = node['arcgis']['version']
+    default['arcgis']['desktop']['authorization_file_version'] = node['arcgis']['version']
+  else
+    throw 'Unsupported ArcGIS version'
+  end
 
+  default['arcgis']['geoevent']['authorization_file'] = ''
+  default['arcgis']['geoevent']['authorization_file_version'] = node['arcgis']['server']['authorization_file_version']
+  default['arcgis']['geoevent']['setup'] = 'C:\\Temp\\ArcGIS_GeoEventExtension\\setup.exe'
 else # node['platform'] == 'linux'
   default['arcgis']['web_adaptor']['install_subdir'] = 'arcgis/webadaptor' + node['arcgis']['version']
   default['arcgis']['licensemanager']['install_subdir'] = 'arcgis/license' + node['arcgis']['version']

metadata.rb

@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs and configures ArcGIS'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '2.2.0'
+version          '2.2.1'
 #issues_url       'https://github.com/ArcGIS/arcgis-cookbook/issues'
 #source_url       'https://github.com/ArcGIS/arcgis-cookbook'
 

providers/iis.rb

@@ -21,15 +21,15 @@
 
 action :enable do
   # Install .Net Framework 3.5 for Windows Server 2012r2
-  if node['platform_version'].to_f >= 6.3
-    if node['kernel']['os_info']['product_type'] != Chef::ReservedNames::Win32::API::System::VER_NT_WORKSTATION
-      windows_feature 'Net-Framework-Core' do
-        provider Chef::Provider::WindowsFeaturePowershell
-        all true
-        action :install
-      end
-    end
-  end
+#  if node['platform_version'].to_f >= 6.3
+#    if node['kernel']['os_info']['product_type'] != Chef::ReservedNames::Win32::API::System::VER_NT_WORKSTATION
+#      windows_feature 'Net-Framework-Core' do
+#        provider Chef::Provider::WindowsFeaturePowershell
+#        all true
+#        action :install
+#      end
+#    end
+#  end
 
   node['arcgis']['iis']['features'].each do |feature|
     windows_feature feature do

providers/portal.rb

@@ -71,9 +71,18 @@
     execute 'Install Portal for ArcGIS' do
       command "\"#{cmd}\" #{args}"
       timeout 7200
+      notifies :run, 'ruby_block[Wait for Portal installation to finish]', :immediately
       not_if { installed }
     end
 
+    # After setup is completed Portal still copies data to content directory
+    ruby_block 'Wait for Portal installation to finish' do
+      block do
+        sleep(600.0)  
+      end
+      action :nothing
+    end
+
     configureserviceaccount = ::File.join(@new_resource.install_dir,
                                           'tools', 'ConfigUtility',
                                           'configureserviceaccount.bat')
@@ -97,14 +106,6 @@
     service 'Portal for ArcGIS' do
       action [:enable, :start]
     end
-
-    ruby_block 'Wait for Portal installation to finish' do
-      block do
-        sleep(180.0)
-      end
-      # action :nothing
-      # subscribes :run, 'execute[Install Portal for ArcGIS]', :immediately
-    end
   else
     cmd = @new_resource.setup
     args = "-m silent -l yes -d \"#{@new_resource.install_dir}\""
@@ -128,6 +129,15 @@
     execute 'Install Portal for ArcGIS' do
       command "su - #{run_as_user} -c \"#{cmd} #{args}\""
       only_if { !::File.exist?(start_portal_path) }
+      notifies :run, 'ruby_block[Wait for Portal installation to finish]', :immediately
+    end
+
+    # After setup is completed Portal still copies data to content directory
+    ruby_block 'Wait for Portal installation to finish' do
+      block do
+        sleep(600.0)  
+      end
+      action :nothing
     end
 
     ruby_block 'Set dir.data property' do
@@ -347,7 +357,7 @@
       @new_resource.server_password)
 
     if @new_resource.is_hosting
-      sleep(120.0)
+      sleep(300.0)
       portal_admin_client.update_server(server_id, 'HOSTING_SERVER')
     end