PR Updates based on reviews
* Addition of comments to [azure] section in muchos.props.example
* Changes to README.md
* Minor spelling error corrections
* Update config.py to be stylistically consistent
Signed-off-by: Nikhil Manchanda <SlickNik@gmail.com>
diff --git a/README.md b/README.md
index c8f83c2..e429802 100644
--- a/README.md
+++ b/README.md
@@ -156,11 +156,14 @@
* `proxy_hostname` (optional) is the name of the machine which has access to the cluster VNET
Under the `azure` section, edit following values as per your configuration
-* `resource_group` and provide the same created in your Azure subscription for the cluster deployment
-* `vnet` and provide the same created in your Azure subscription for the cluster deployment
-* `subnet` and provide the same created in your Azure subscription for the cluster deployment
-* `numnodes` can be changed as per the cluster size
-* `vm_sku` can be specified from the available skus in the [selected Azure region](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/cli-ps-findimage)
+* `resource_group` to provide the resource-group name for the cluster deployment. A new resource group with
+ this name will be created if it doesn't already exist
+* `vnet` to provide the name of the VNET that your cluster nodes should use. A new VNET with this name will be
+ created if it doesn't already exist
+* `subnet` to provide a name for the subnet within which the cluster resources will be deployed
+* `numnodes` to change the cluster size in terms of number of nodes deployed
+* `vm_sku` to specify the VM size to use. You can choose from the
+ [available VM sizes](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes-general).
Within Azure the `nodes` section is auto populated with the hostnames and their default roles.
@@ -333,7 +336,7 @@
[aws-config]: http://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html
[awscli]: https://docs.aws.amazon.com/cli/latest/userguide/installing.html
[awscli-config]: http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#cli-quick-configuration
-[azure-cli]: https://packages.microsoft.com/yumrepos/azure-cli/azure-cli-2.0.69-1.el7.x86_64.rpm
+[azure-cli]: https://docs.microsoft.com/en-us/cli/azure/?view=azure-cli-latest
[ansible-azure]: https://docs.ansible.com/ansible/latest/scenario_guides/guide_azure.html
[fluo-app]: https://github.com/apache/fluo/blob/master/docs/applications.md
[WebIndex]: https://github.com/apache/fluo-examples/tree/master/webindex
diff --git a/ansible/roles/common/tasks/azure.yml b/ansible/roles/common/tasks/azure.yml
index bcbe967..16f34e9 100644
--- a/ansible/roles/common/tasks/azure.yml
+++ b/ansible/roles/common/tasks/azure.yml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-- name: Find luns
+- name: Find luns
find:
paths: "/dev/disk/azure/scsi1"
patterns: "lun*"
@@ -41,14 +41,14 @@
fstype: xfs
state: mounted
with_indexed_items: "{{ disk_uuids.results }}"
-- name: Set mount point ownership
+- name: Set mount point ownership
file:
path: '{{ mount_root }}{{ item.0 + 1 }}'
state: directory
owner: "{{ cluster_user }}"
group: "{{ cluster_group }}"
with_indexed_items: "{{ files_matched.files }}"
-- name: Create directry to mount Azure File share
+- name: Create directory to mount Azure File share
file:
path: "{{ azure_fileshare_mount }}"
state: directory
diff --git a/conf/muchos.props.example b/conf/muchos.props.example
index 2615af4..cb7bb28 100644
--- a/conf/muchos.props.example
+++ b/conf/muchos.props.example
@@ -91,6 +91,47 @@
# Shutdown behavior of EC2 instances: terminate or stop
shutdown_behavior = stop
+[azure]
+# Name of the Azure resource group to use. All resources are created within this
+# resource group. If a resource group with this name already exists, it will be
+# used, otherwise a new resource group with this name will be created and used.
+resource_group = accumulo-rg
+# Name of the Azure Virtual Network (VNET) to use. If a VNET with this name
+# already exists, it will be used; else a new VNET with this name will be created.
+vnet = vnet1
+# The CIDR prefix used to create the virtual network (VNET).
+vnet_cidr = "10.0.0.0/8"
+# A single subnet is created within the VNET and given the following name.
+subnet = subnet1
+# The CIDR prefix used for the single subnet within the virtual network.
+subnet_cidr = "10.1.0.0/16"
+# Size of the cluster to provision.
+# A virtual machine scale set (VMSS) with these many VMs will be created.
+# The minimum allowed size for this is 3 nodes.
+numnodes = 8
+# The size of each virtual machine. See the following link for other sizes:
+# https://docs.microsoft.com/en-us/azure/virtual-machines/linux/sizes-general
+vm_sku = Standard_D8s_v3
+# Each VM will be provisioned with the following type of managed disk
+managed_disk_type = Standard_LRS
+# Number of managed disks provisioned on each VM
+numdisks = 3
+# The size of each managed disk provisioned
+disk_size_gb = 128
+# Location to mount managed disks in each VM
+mount_root = /var/data
+# Location where the metrics data will be written
+metrics_drive_root = var-data
+# Optional proxy VM. If not set, the first node of the cluster will be selected as the proxy.
+azure_proxy_host =
+location = westus2
+# Optional Azure fileshare to mount on all nodes.
+# Path and credentials must be updated to enable this.
+#azure_fileshare_mount = /mnt/azure-fileshare
+#azure_fileshare = //fileshare-to-mount.file.core.windows.net/path
+#azure_fileshare_username = fs_username
+#azure_fileshare_password = fs_password
+
[existing]
# Root of data dirs
mount_root = /var/data
@@ -108,29 +149,6 @@
# Below are different performance profiles that can be selected. Each profile
# has the same properties with different values.
-[azure]
-resource_group = accumulo-rg
-vnet = vnet1
-vnet_cidr = "10.0.0.0/8"
-subnet = subnet1
-subnet_cidr = "10.1.0.0/16"
-numnodes = 8
-vm_sku = Standard_D8s_v3
-managed_disk_type = Standard_LRS
-numdisks = 3
-disk_size_gb = 128
-mount_root = /var/data
-metrics_drive_root = var-data
-# Optional proxy VM. If not set, the first node of the cluster will be selected as the proxy.
-azure_proxy_host =
-location = westus2
-# Optional Azure fileshare to mount on all nodes.
-# Path and credentials must be updated to enable this.
-#azure_fileshare_mount = /mnt/azure-fileshare
-#azure_fileshare = //fileshare-to-mount.file.core.windows.net/path
-#azure_fileshare_username = fs_username
-#azure_fileshare_password = fs_password
-
[perf-small]
# Amount of JVM heap for each tserver
accumulo_tserv_mem=2G
diff --git a/lib/muchos/config.py b/lib/muchos/config.py
index b0f004b..8322d79 100644
--- a/lib/muchos/config.py
+++ b/lib/muchos/config.py
@@ -52,12 +52,12 @@
proxy = self.get('general', 'proxy_hostname')
cluster_type = self.get('general', 'cluster_type')
if cluster_type not in ['azure']:
- if not proxy:
- exit("ERROR - proxy.hostname must be set in muchos.props")
+ if not proxy:
+ exit("ERROR - proxy.hostname must be set in muchos.props")
- if proxy not in self.node_d:
- exit("ERROR - The proxy (set by property proxy_hostname={0}) cannot be found in 'nodes' section of "
- "muchos.props".format(proxy))
+ if proxy not in self.node_d:
+ exit("ERROR - The proxy (set by property proxy_hostname={0}) cannot be found in 'nodes' section of "
+ "muchos.props".format(proxy))
if action in ['launch', 'setup']:
for service in SERVICES:
@@ -149,11 +149,11 @@
elif self.get_cluster_type() == 'existing':
data_dirs = self.get('existing', 'data_dirs').split(",")
elif self.get_cluster_type() == 'azure':
- num_disks = int(self.get("azure","numdisks"))
+ num_disks = int(self.get("azure", "numdisks"))
range_var = num_disks + 1
for diskNum in range(1, range_var):
- data_dirs.append(self.get("azure","mount_root") + str(diskNum))
-
+ data_dirs.append(self.get("azure", "mount_root") +
+ str(diskNum))
return data_dirs
@@ -173,9 +173,10 @@
return self.get("existing", "metrics_drive_ids").split(",")
elif self.get_cluster_type() == 'azure':
drive_ids = []
- range_var = int(self.get("azure","numdisks")) + 1
+ range_var = int(self.get("azure", "numdisks")) + 1
for i in range(1, range_var):
- drive_ids.append(self.get("azure","metrics_drive_root") + str(i))
+ drive_ids.append(self.get("azure", "metrics_drive_root") +
+ str(i))
return drive_ids
def shutdown_delay_minutes(self):
