deprecate ops_manager_vm

- use ops_manager_image_uri to decide ops manager vm count

[#164811649]

Signed-off-by: Nick Rohn <nrohn@pivotal.io>

README.md

@@ -104,7 +104,7 @@ dns_subdomain         = ""
 - tenant_id: **(required)** Azure account tenant id
 - client_id: **(required)** Azure automation account client id
 - client_secret: **(required)** Azure automation account client secret
-- ops_manager_image_uri: **(required)** URL for an OpsMan image hosted on Azure
+- ops_manager_image_uri: **(required)** URL for an OpsMan image hosted on Azure (if not provided you get no Ops Manager)
 - location: **(required)** Azure location to stand up environment in
 - dns_suffix: **(required)** Domain to add environment subdomain to
 

terraforming-pas/main.tf

@@ -29,7 +29,7 @@ module "ops_manager" {
   env_name = "${var.env_name}"
   location = "${var.location}"
 
-  vm_count               = "${var.ops_manager_vm ? 1 : 0}"
+  vm_count               = "${var.ops_manager_vm == false ? 0 : (var.ops_manager_image_uri == "" ? 0 : 1)}"
   ops_manager_image_uri  = "${var.ops_manager_image_uri}"
   ops_manager_vm_size    = "${var.ops_manager_vm_size}"
   ops_manager_private_ip = "${var.ops_manager_private_ip}"

terraforming-pas/variables.tf

@@ -69,12 +69,11 @@ variable "ssl_ca_private_key" {
   default     = ""
 }
 
-variable "ops_manager_vm" {
-  default = true
+variable "ops_manager_image_uri" {
+  type        = "string"
+  description = "Ops Manager image on Azure. Ops Manager VM will be skipped if this is empty"
 }
 
-variable "ops_manager_image_uri" {}
-
 variable "ops_manager_private_ip" {
   type        = "string"
   description = "IP for the Ops Manager instance if not deploying in the default infrasstructure subnet"
@@ -145,3 +144,11 @@ variable "pcf_services_subnet" {
   type    = "string"
   default = "10.0.4.0/22"
 }
+
+/*******************************
+ * Deprecated, Delete After Next Release *
+ *******************************/
+
+variable "ops_manager_vm" {
+  default = true
+}