Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Azure/azure-quickstart-templates
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mkozioro/azure-quickstart-templates
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jul 24, 2017

  1. Simplified sentinel setup for 3 instances.

    @MichalKoziorowski-TomTom
    MichalKoziorowski-TomTom committed Jul 24, 2017
    Copy the full SHA
    d21219d View commit details
Showing with 14 additions and 13 deletions.
  1. +11 −11 redis-high-availability/azuredeploy.json
  2. +3 −2 redis-high-availability/redis-cluster-install.sh
22 changes: 11 additions & 11 deletions redis-high-availability/azuredeploy.json
View file
Original file line number Diff line number Diff line change
@@ -97,26 +97,26 @@
"_comment0": "/* T-shirt sizes may vary for different reasons, and some customers may want to modify these - so feel free to go ahead and define your favorite t-shirts */",
"tshirtSizeSmall": {
"vmSizeMember": "Standard_A1",
"numberOfMasters": 3,
"numberOfSlaves": 0,
"numberOfMasters": 1,
"numberOfSlaves": 2,
"totalMemberCount": 3,
"totalMemberCountExcludingLast": 2,
"vmTemplate": "[concat(variables('templateBaseUrl'), 'node-resources.json')]"
},
"tshirtSizeMedium": {
"vmSizeMember": "Standard_A2",
"numberOfMasters": 3,
"numberOfSlaves": 3,
"totalMemberCount": 6,
"totalMemberCountExcludingLast": 5,
"numberOfMasters": 1,
"numberOfSlaves": 2,
"totalMemberCount": 3,
"totalMemberCountExcludingLast": 2,
"vmTemplate": "[concat(variables('templateBaseUrl'), 'node-resources.json')]"
},
"tshirtSizeLarge": {
"vmSizeMember": "Standard_A5",
"numberOfMasters": 3,
"numberOfSlaves": 6,
"totalMemberCount": 9,
"totalMemberCountExcludingLast": 8,
"numberOfMasters": 1,
"numberOfSlaves": 2,
"totalMemberCount": 3,
"totalMemberCountExcludingLast": 2,
"arbiter": "Enabled",
"vmTemplate": "[concat(variables('templateBaseUrl'), 'node-resources.json')]"
},
@@ -128,7 +128,7 @@
"vmStorageAccountContainerName": "vhd-redis",
"vmStorageAccountDomain": ".blob.core.windows.net",
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworkName'))]",
"scriptUrl": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/redis-high-availability/",
"scriptUrl": "https://raw.githubusercontent.com/mkozioro/azure-quickstart-templates/master/redis-high-availability/",
"templateBaseUrl": "[variables('scriptUrl')]",
"jumpboxTemplateEnabled": "jumpbox-resources.json",
"jumpboxTemplateDisabled": "empty-resources.json",
5 changes: 3 additions & 2 deletions redis-high-availability/redis-cluster-install.sh
View file
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ while getopts :n:v:c:m:s:i:p:lh optname; do
;;
v) # Version to be installed
VERSION=${OPTARG}
if [[ $VERSION == 3.* ]]; then IS_CLUSTER_AWARE=1; fi
# if [[ $VERSION == 3.* ]]; then IS_CLUSTER_AWARE=1; fi
;;
c) # Number of instances
INSTANCE_COUNT=${OPTARG}
@@ -346,7 +346,8 @@ configure_sentinel()
MASTER_NODE_IP="${IP_PREFIX}${MASTER_NODE_INDEX}"

# Patch the sentinel configuration file with a new master
sed -i "s/^sentinel monitor.*$/sentinel monitor mymaster ${MASTER_NODE_IP} ${REDIS_PORT} ${MASTER_NODE_COUNT}/g" /etc/redis/sentinel.conf
# sed -i "s/^sentinel monitor.*$/sentinel monitor mymaster ${MASTER_NODE_IP} ${REDIS_PORT} ${MASTER_NODE_COUNT}/g" /etc/redis/sentinel.conf
sed -i "s/^sentinel monitor.*$/sentinel monitor mymaster ${MASTER_NODE_IP} ${REDIS_PORT} 2/g" /etc/redis/sentinel.conf

# Make a writable log file
touch /var/log/redis-sentinel.log