Skip to content

Commit

Permalink
Support for Solr search provider in 8.2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbaranov committed Jul 16, 2018
1 parent cde27c7 commit 3e7949b
Show file tree
Hide file tree
Showing 24 changed files with 5,396 additions and 61 deletions.
12 changes: 12 additions & 0 deletions Sitecore 8.2.7/xdb/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ The **deploymentId** and **licenseXml** parameters are filled in by the PowerShe
| trackingHistoryMongoDbConnectionString | A MongoDB connection string for the tracking.history database.
| trackingContactMongoDbConnectionString | A MongoDB connection string for the tracking.contact database.

## Deploying with Solr Search
> **solrConnectionString** is a link to the Solr search service. The parameter specifies whether Solr
> search will be used for the deployment or not. The default value is empty which means that Azure Search
> will be used. In the case where solrConnectionString is populated with the Solr search connection string,
> the following parameters should be additionally specified in `azuredeploy.parameters.json`:
| Parameter | Description
--------------------------------------------|------------------------------------------------
| bootloaderMsDeployPackageUrl | Specifies a blob storage url to a bootloader Web Deploy package.
| prcSolrConfigurationMsDeployPackageUrl | Specifies a blob storage url to Solr **PRC** configuration Web Deploy package.
| repSolrConfigurationMsDeployPackageUrl | Specifies a blob storage url to Solr **REP** configuration Web Deploy package.

> **Note:**
> * The **searchServiceLocation** parameter can be added to the `azuredeploy.parameters.json`
> to specify geographical region to deploy Azure Search Service. Default value is the resource
Expand Down
235 changes: 220 additions & 15 deletions Sitecore 8.2.7/xdb/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,30 @@
"resourcesApiVersion": "2016-09-01",
"defaultDependency": [
{
"name": "application"
"name": "[if(empty(parameters('solrConnectionString')), 'application-as', 'application-solr')]"
}
],
"dependencies": "[concat(variables('defaultDependency'), parameters('modules').items)]"
"moduleFullList": "[union(parameters('systemModules').items, parameters('modules').items)]",
"dependencies": "[concat(variables('defaultDependency'), variables('moduleFullList'))]"
},
"parameters": {
"modules": {
"type": "secureObject",
"defaultValue": {
"items": [
]
}
},
"systemModules": {
"type": "secureObject",
"defaultValue": {
"items": [
{
"name": "empty",
"templateLink": "[concat(uri(parameters('templateLinkBase'), 'nested/emptyAddon.json'), parameters('templateLinkAccessToken'))]",
"name": "bootloader",
"deployModule": "[not(empty(parameters('bootloaderMsDeployPackageUrl')))]",
"templateLink": "[concat(uri(parameters('templateLinkBase'), 'addons/bootloader.json'), parameters('templateLinkAccessToken'))]",
"parameters": {
"msDeployPackageUrl": "[parameters('bootloaderMsDeployPackageUrl')]"
}
}
]
Expand Down Expand Up @@ -263,6 +273,24 @@
"minLength": 1
},

"bootloaderMsDeployPackageUrl": {
"type": "securestring",
"defaultValue": ""
},

"solrConnectionString": {
"type": "securestring",
"defaultValue": ""
},
"prcSolrConfigurationMsDeployPackageUrl": {
"type": "securestring",
"defaultValue": ""
},
"repSolrConfigurationMsDeployPackageUrl": {
"type": "securestring",
"defaultValue": ""
},

"securityClientIp": {
"type": "string",
"defaultValue": "0.0.0.0"
Expand Down Expand Up @@ -290,7 +318,7 @@
"resources": [
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(deployment().name, '-infrastructure')]",
"name": "[concat(parameters('deploymentId'), '-infrastructure')]",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "incremental",
Expand Down Expand Up @@ -342,6 +370,10 @@
"value": "[parameters('reportingSqlDatabaseName')]"
},

"deployAzureSearch": {
"value": "[empty(parameters('solrConnectionString'))]"
},

"searchServiceName": {
"value": "[parameters('searchServiceName')]"
},
Expand Down Expand Up @@ -384,14 +416,19 @@
},
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(deployment().name, '-application')]",
"name": "[concat(parameters('deploymentId'), '-application-as')]",
"type": "Microsoft.Resources/deployments",
"condition": "[empty(parameters('solrConnectionString'))]",
"properties": {
"mode": "incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/application.json'), parameters('templateLinkAccessToken'))]"
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/application-as.json'), parameters('templateLinkAccessToken'))]"
},
"parameters": {
"templateLinkAccessToken": {
"value": "[parameters('templateLinkAccessToken')]"
},

"deploymentId": {
"value": "[parameters('deploymentId')]"
},
Expand Down Expand Up @@ -528,26 +565,192 @@
},

"infrastructure": {
"value": "[reference(concat(deployment().name, '-infrastructure')).outputs.infrastructure.value]"
"value": "[reference(concat(parameters('deploymentId'), '-infrastructure')).outputs.infrastructure.value]"
}
}
},
"dependsOn": [
"[resourceId('Microsoft.Resources/deployments', concat(parameters('deploymentId'), '-infrastructure'))]"
]
},
{
"apiVersion": "[variables('resourcesApiVersion')]",
"name": "[concat(parameters('deploymentId'), '-application-solr')]",
"type": "Microsoft.Resources/deployments",
"condition": "[not(empty(parameters('solrConnectionString')))]",
"properties": {
"mode": "incremental",
"templateLink": {
"uri": "[concat(uri(parameters('templateLinkBase'), 'nested/application-solr.json'), parameters('templateLinkAccessToken'))]"
},
"parameters": {
"templateLinkAccessToken": {
"value": "[parameters('templateLinkAccessToken')]"
},

"deploymentId": {
"value": "[parameters('deploymentId')]"
},
"location": {
"value": "[parameters('location')]"
},
"sitecoreAdminPassword": {
"value": "[parameters('sitecoreAdminPassword')]"
},
"passwordSalt": {
"value": "[parameters('passwordSalt')]"
},
"licenseXml": {
"value": "[parameters('licenseXml')]"
},

"prcWebAppName": {
"value": "[parameters('prcWebAppName')]"
},
"prcMsDeployPackageUrl": {
"value": "[parameters('prcMsDeployPackageUrl')]"
},
"prcCoreSqlDatabaseUserName": {
"value": "[parameters('prcCoreSqlDatabaseUserName')]"
},
"prcCoreSqlDatabasePassword": {
"value": "[parameters('prcCoreSqlDatabasePassword')]"
},
"prcMasterSqlDatabaseUserName": {
"value": "[parameters('prcMasterSqlDatabaseUserName')]"
},
"prcMasterSqlDatabasePassword": {
"value": "[parameters('prcMasterSqlDatabasePassword')]"
},
"prcWebSqlDatabaseUserName": {
"value": "[parameters('prcWebSqlDatabaseUserName')]"
},
"prcWebSqlDatabasePassword": {
"value": "[parameters('prcWebSqlDatabasePassword')]"
},
"prcReportingSqlDatabaseUserName": {
"value": "[parameters('prcReportingSqlDatabaseUserName')]"
},
"prcReportingSqlDatabasePassword": {
"value": "[parameters('prcReportingSqlDatabasePassword')]"
},

"repWebAppName": {
"value": "[parameters('repWebAppName')]"
},
"repMsDeployPackageUrl": {
"value": "[parameters('repMsDeployPackageUrl')]"
},
"repCoreSqlDatabaseUserName": {
"value": "[parameters('repCoreSqlDatabaseUserName')]"
},
"repCoreSqlDatabasePassword": {
"value": "[parameters('repCoreSqlDatabasePassword')]"
},
"repMasterSqlDatabaseUserName": {
"value": "[parameters('repMasterSqlDatabaseUserName')]"
},
"repMasterSqlDatabasePassword": {
"value": "[parameters('repMasterSqlDatabasePassword')]"
},
"repWebSqlDatabaseUserName": {
"value": "[parameters('repWebSqlDatabaseUserName')]"
},
"repWebSqlDatabasePassword": {
"value": "[parameters('repWebSqlDatabasePassword')]"
},
"repReportingSqlDatabaseUserName": {
"value": "[parameters('repReportingSqlDatabaseUserName')]"
},
"repReportingSqlDatabasePassword": {
"value": "[parameters('repReportingSqlDatabasePassword')]"
},
"repAuthenticationApiKey": {
"value": "[parameters('repAuthenticationApiKey')]"
},

"sqlServerLogin": {
"value": "[parameters('sqlServerLogin')]"
},
"sqlServerPassword": {
"value": "[parameters('sqlServerPassword')]"
},
"webSqlServerLogin": {
"value": "[parameters('webSqlServerLogin')]"
},
"webSqlServerPassword": {
"value": "[parameters('webSqlServerPassword')]"
},

"coreSqlDatabaseName": {
"value": "[parameters('coreSqlDatabaseName')]"
},
"masterSqlDatabaseName": {
"value": "[parameters('masterSqlDatabaseName')]"
},
"webSqlDatabaseName": {
"value": "[parameters('webSqlDatabaseName')]"
},
"reportingSqlDatabaseName": {
"value": "[parameters('reportingSqlDatabaseName')]"
},

"solrConnectionString": {
"value": "[parameters('solrConnectionString')]"
},
"prcSolrConfigurationMsDeployPackageUrl": {
"value": "[parameters('prcSolrConfigurationMsDeployPackageUrl')]"
},
"repSolrConfigurationMsDeployPackageUrl": {
"value": "[parameters('repSolrConfigurationMsDeployPackageUrl')]"
},

"applicationInsightsName": {
"value": "[parameters('applicationInsightsName')]"
},

"analyticsMongoDbConnectionString": {
"value": "[parameters('analyticsMongoDbConnectionString')]"
},
"trackingLiveMongoDbConnectionString": {
"value": "[parameters('trackingLiveMongoDbConnectionString')]"
},
"trackingHistoryMongoDbConnectionString": {
"value": "[parameters('trackingHistoryMongoDbConnectionString')]"
},
"trackingContactMongoDbConnectionString": {
"value": "[parameters('trackingContactMongoDbConnectionString')]"
},

"securityClientIp": {
"value": "[parameters('securityClientIp')]"
},
"securityClientIpMask": {
"value": "[parameters('securityClientIpMask')]"
},

"infrastructure": {
"value": "[reference(concat(parameters('deploymentId'), '-infrastructure')).outputs.infrastructure.value]"
}
}
},
"dependsOn": [
"[resourceId('Microsoft.Resources/deployments', concat(deployment().name, '-infrastructure'))]"
"[resourceId('Microsoft.Resources/deployments', concat(parameters('deploymentId'), '-infrastructure'))]"
]
},
{
"copy": {
"name": "modules",
"count": "[length(parameters('modules').items)]"
"count": "[length(variables('moduleFullList'))]"
},
"name": "[concat(deployment().name, '-' , parameters('modules').items[copyIndex()].name)]",
"name": "[concat(parameters('deploymentId'), '-' , variables('moduleFullList')[copyIndex()].name)]",
"condition": "[if(contains(variables('moduleFullList')[copyIndex()], 'deployModule'), variables('moduleFullList')[copyIndex()].deployModule, bool('true'))]",
"apiVersion": "[variables('resourcesApiVersion')]",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "incremental",
"templateLink": {
"uri": "[parameters('modules').items[copyIndex()].templateLink]"
"uri": "[variables('moduleFullList')[copyIndex()].templateLink]"
},
"parameters": {
"standard": {
Expand Down Expand Up @@ -604,17 +807,19 @@
"trackingHistoryMongoDbConnectionString": "[parameters('trackingHistoryMongoDbConnectionString')]",
"trackingContactMongoDbConnectionString": "[parameters('trackingContactMongoDbConnectionString')]",

"solrConnectionString": "[parameters('solrConnectionString')]",

"securityClientIp": "[parameters('securityClientIp')]",
"securityClientIpMask": "[parameters('securityClientIpMask')]",

"infrastructure": "[reference(concat(deployment().name, '-infrastructure')).outputs.infrastructure.value]"
"infrastructure": "[reference(concat(parameters('deploymentId'), '-infrastructure')).outputs.infrastructure.value]"
}
},
"extension": { "value": "[parameters('modules').items[copyIndex()].parameters]" }
"extension": { "value": "[variables('moduleFullList')[copyIndex()].parameters]" }
}
},
"dependsOn": [
"[concat(deployment().name, '-' , variables('dependencies')[copyIndex()].name)]"
"[concat(parameters('deploymentId'), '-' , variables('dependencies')[copyIndex()].name)]"
]
}
]
Expand Down
Loading

0 comments on commit 3e7949b

Please sign in to comment.