Merge pull request #95 from Esri/v3.1.0

Release v3.1.0

Author: pbobov

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.
 
+3.1.0
+-----
+- Added support for ArcGIS 10.5.1.
+
 3.0.0
 -----
 - Updated ArcGIS product names

cookbooks/arcgis-desktop/README.md

@@ -5,17 +5,23 @@ This cookbook installs and configures ArcGIS Desktop.
 
 Requirements
 ------------
+### Supported ArcGIS versions
+* 10.4
+* 10.4.1
+* 10.5
+* 10.5.1
 
 ### Supported ArcGIS software
-* ArcGIS 10.4/10.4.1/10.5 Desktop (Windows only)
-* ArcGIS 10.4/10.4.1/10.5 License Manager 
+* ArcGIS Desktop (Windows only)
+* ArcGIS License Manager 
 
 ### Platforms
 * Windows 7
 * Windows 8 (8.1)
 * Windows 10
 * Windows Server 2008 (R2)
 * Windows Server 2012 (R2)
+* Windows Server 2016
 
 ### Dependencies
 The following cookbooks are required:

cookbooks/arcgis-desktop/attributes/default.rb

@@ -18,7 +18,7 @@
 
 default['arcgis']['run_as_user'] = 'arcgis'
 default['arcgis']['run_as_password'] = 'Pa$$w0rdPa$$w0rd'
-default['arcgis']['version'] = '10.5'
+default['arcgis']['version'] = '10.5.1'
 default['arcgis']['desktop']['version'] = node['arcgis']['version']
 
 case node['platform']

cookbooks/arcgis-desktop/metadata.rb

@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs and configures ArcGIS Desktop'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '3.0.0'
+version          '3.1.0'
 
 depends          'windows'
 depends          'limits'

cookbooks/arcgis-desktop/providers/desktop.rb

@@ -16,6 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+use_inline_resources if defined?(use_inline_resources)
+
 action :system do
   if node['platform'] == 'windows'
     # TODO: Ensure Desktop system requirements 

cookbooks/arcgis-desktop/providers/licensemanager.rb

@@ -16,6 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+use_inline_resources if defined?(use_inline_resources)
+
 action :system do
   if node['platform'] == 'windows'
     #TODO: Ensure License Manager system requirements on Windows

cookbooks/arcgis-desktop/providers/user.rb

@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+use_inline_resources if defined?(use_inline_resources)
+
 action :create do
   if platform?('windows')
     user node['arcgis']['run_as_user'] do

cookbooks/arcgis-enterprise/CHANGELOG.md

@@ -3,6 +3,13 @@ arcgis-enterprise cookbook CHANGELOG
 
 This file is used to list changes made in each version of the arcgis-enterprise cookbook.
 
+3.1.0
+-----
+- Added support for ArcGIS Enterprise 10.5.1.
+- Added support for configuring ArcGIS Server identity stores and assigns privileges to roles.
+- Added support for installing ArcGIS Enterprise patches.
+- Set default values for sensitive attributes using environmental variables.
+
 3.0.0
 -----
 - 'iis' recipe moved to new 'esri-iis' cookbook.

cookbooks/arcgis-enterprise/README.md

@@ -6,11 +6,17 @@ This cookbook installs and configures ArcGIS Enterprise products, components, an
 Requirements
 ------------
 
+### Supported ArcGIS versions
+* 10.4
+* 10.4.1
+* 10.5
+* 10.5.1
+
 ### Supported ArcGIS software
-* ArcGIS 10.4/10.4.1/10.5 Server
-* ArcGIS 10.4/10.4.1/10.5 Data Store
-* Portal for ArcGIS 10.4/10.4.1/10.5
-* ArcGIS 10.4/10.4.1/10.5 Web Adaptor (IIS/Java) 
+* ArcGIS Server
+* ArcGIS Data Store
+* Portal for ArcGIS
+* ArcGIS Web Adaptor (IIS/Java) 
 
 ### Platforms
 * Windows 7
@@ -47,6 +53,7 @@ Portal for ArcGIS, and ArcGIS Data Store. Default value is`Pa$$w0rdPa$$w0rd`.
 * `node['arcgis']['python']['install_dir']` = Python installation directory. By default Python is installed at `C:\Python27`.
 * `node['arcgis']['repository']['setups']` = Path to folder with ArcGIS software setups. Default path is `%USERPROFILE%\Documents` on Windows and `~/arcgis` on Linux.
 * `node['arcgis']['repository']['archives']` = Path to folder with ArcGIS software setup archives. Default path is `%USERPROFILE%\Software\Esri` on Windows and `~/software/esri` on Linux.
+* `node['arcgis']['repository']['patches']` = Path to folder with hot fixes and patches for ArcGIS Enterprise software. The default path on Windows is `%USERPROFILE%\Software\Esri\Patches`,   on Linux is `~/software/esri/patches`.
 * `node['arcgis']['post_install_script']` = Custom post-installation script path. The default path on Windows is `C:\imageryscripts\deploy.bat`, on Linux is `/arcgis/imageryscripts/deploy.sh`.
 
 #### File Server
@@ -89,6 +96,10 @@ Portal for ArcGIS, and ArcGIS Data Store. Default value is`Pa$$w0rdPa$$w0rd`.
 * `node['arcgis']['server']['config_store_connection_string']` = ArcGIS Server config store type. Default value is `C:\arcgisserver\config-store` on Windows and `/arcgis/server/usr/config-store` on Linux.
 * `node['arcgis']['server']['config_store_connection_secret']` = ArcGIS Server config store type secret. Default value is `nil`.
 * `node['arcgis']['server']['services']` = An array of ArcGIS Server services to be published. Default value is `{}`.
+* `node['arcgis']['server']['security']['user_store_config']` = User store configuration. Default value is `{'type' => 'BUILTIN', 'properties' => {}}`
+* `node['arcgis']['server']['security']['role_store_config']` = Role store configuration. Default value is `{'type' => 'BUILTIN', 'properties' => {}}`
+* `node['arcgis']['server']['security']['privileges']` = Privileges to user roles assignments `{'PUBLISH' => [], 'ADMINISTER' => []}`
+
 
 #### Web Adaptor
 
@@ -197,6 +208,9 @@ Configures iptables to forward ports 80/443 to 8080/8443.
 ### arcgis-enterprise::lp-install
 Installs language packs for ArcGIS for Server software.
 
+### arcgis-enterprise::patches
+Installs hot fixes and patches for ArcGIS Enterprise software.
+
 ### arcgis-enterprise::portal
 Installs and configures Portal for ArcGIS.
 
@@ -218,6 +232,9 @@ Installs and configures ArcGIS Server site.
 ### arcgis-enterprise::server_node
 Installs ArcGIS Server on the machine and joins an existing site.
 
+### arcgis-enterprise::server_security
+Configures ArcGIS Server identity stores and assigns privileges to roles.
+
 ### arcgis-enterprise::server_wa
 Installs ArcGIS Web Adaptor and configures it with ArcGIS Server. IIS or Java application server such as Tomcat must be installed and configured before installing ArcGIS Web Adaptor.
 

cookbooks/arcgis-enterprise/attributes/datastore.rb

@@ -43,7 +43,7 @@
     case node['arcgis']['version']
     when '10.5.1'
       data_store['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
-                                            'ArcGIS_DataStore_Windows_1051_XXXXXX.exe')
+                                            'ArcGIS_DataStore_Windows_1051_156366.exe')
       data_store['product_code'] = '{75276C83-E88C-43F6-B481-100DA4D64F71}'
     when '10.5'
       data_store['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
@@ -69,7 +69,7 @@
     case node['arcgis']['version']
     when '10.5.1'
       data_store['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
-                                            'ArcGIS_DataStore_Linux_1051_XXXXXX.tar.gz')
+                                            'ArcGIS_DataStore_Linux_1051_156441.tar.gz')
     when '10.5'
       data_store['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                             'ArcGIS_DataStore_Linux_105_154054.tar.gz')