Added a new rule to .gitingore file

.gitignore

@@ -17,3 +17,4 @@ inventory/terraform.py
 tests/spec/*/*runtime_spec.rb
 contrib-plugins/*
 terraform/*/.terraform
+terraform/azure/ssh_thumbprint

bootstrap/common.sh

@@ -3,8 +3,7 @@
 # Util functions cloud reusable.
 APOLLO_ROOT=$(dirname "${BASH_SOURCE}")/..
 DEFAULT_CONFIG="${APOLLO_ROOT}/bootstrap/${APOLLO_PROVIDER}/${APOLLO_CONFIG_FILE-"config-default.sh"}"
-# It must be change before mergeing with capgemini master branch
-DYNAMIC_INVENTORY="https://raw.githubusercontent.com/ravbaba/terraform.py/azure-provider/terraform.py"
+DYNAMIC_INVENTORY="https://raw.githubusercontent.com/Capgemini/terraform.py/master/terraform.py"
 
 if [ -f "${DEFAULT_CONFIG}" ]; then
   source "${DEFAULT_CONFIG}"

terraform/azure/mesos-masters.tf

@@ -20,9 +20,9 @@ resource "azure_instance" "mesos-master" {
   image                = "${var.atlas_artifact.master}"
   size                 = "${var.instance_type.master}"
   storage_service_name = "${azure_storage_service.azure_mesos_storage.name}"
+  security_group       = "${azure_security_group.default.name}"
   virtual_network      = "${azure_virtual_network.public.name}"
   subnet               = "public-network-subnet"
-  security_group       = "${azure_security_group.default.name}"
   location             = "${var.region}"
   username             = "${var.username}"
   ssh_key_thumbprint   = "${file("ssh_thumbprint")}"

terraform/azure/mesos-slaves.tf

@@ -20,9 +20,9 @@ resource "azure_instance" "mesos-slave" {
   image                = "${var.atlas_artifact.slave}"
   size                 = "${var.instance_type.slave}"
   storage_service_name = "${azure_storage_service.azure_mesos_storage.name}"
+  security_group       = "${azure_security_group.default.name}"
   virtual_network      = "${azure_virtual_network.public.name}"
   subnet               = "public-network-subnet"
-  security_group       = "${azure_security_group.default.name}"
   location             = "${var.region}"
   username             = "${var.username}"
   ssh_key_thumbprint   = "${file("ssh_thumbprint")}"

terraform/azure/provider.tf

@@ -1,3 +1,3 @@
 provider "azure" {
-   settings_file = "${var.azure_settings_file}"
+  settings_file = "${file(var.azure_settings_file)}"
 }