Merge branch 'master' into real-acceptance-test

Author: mikejihbe

.gitignore

@@ -40,3 +40,4 @@ crash.log
 terraform-encrypted-des.sh
 terraform-encrypted.sh
 terraform-plain.sh
+.DS_Store

data_source_obmcs_core_instance.go

@@ -65,6 +65,10 @@ func resourceCoreInstance() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"ipxe_script": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"metadata": {
 				Type:     schema.TypeMap,
 				Computed: true,
@@ -144,6 +148,7 @@ func (s *InstanceDatasourceCrud) SetData() {
 				"display_name":        v.DisplayName,
 				"id":                  v.ID,
 				"image":               v.ImageID,
+				"ipxe_script":         v.IpxeScript,
 				"metadata":            v.Metadata,
 				"region":              v.Region,
 				"shape":               v.Shape,

data_source_obmcs_core_subnet.go

@@ -80,6 +80,10 @@ func resourceCoreSubnets() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"prohibit_public_ip_on_vnic": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -154,10 +158,11 @@ func (s *SubnetDatasourceCrud) SetData() {
 				"security_list_ids":   v.SecurityListIDs,
 				"display_name":        v.DisplayName,
 				"id":                  v.ID,
-				"state":               v.State,
-				"time_created":        v.TimeCreated.String(),
-				"virtual_router_ip":   v.VirtualRouterIP,
-				"virtual_router_mac":  v.VirtualRouterMac,
+				"prohibit_public_ip_on_vnic": v.ProhibitPublicIpOnVnic,
+				"state":              v.State,
+				"time_created":       v.TimeCreated.String(),
+				"virtual_router_ip":  v.VirtualRouterIP,
+				"virtual_router_mac": v.VirtualRouterMac,
 			}
 			resources = append(resources, res)
 		}

data_source_obmcs_core_vnic.go

@@ -34,6 +34,10 @@ func VnicDatasource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"hostname_label": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -81,6 +85,7 @@ func (v *VnicDatasourceCrud) SetData() {
 		v.D.Set("availability_domain", v.Resource.AvailabilityDomain)
 		v.D.Set("compartment_id", v.Resource.CompartmentID)
 		v.D.Set("display_name", v.Resource.DisplayName)
+		v.D.Set("hostname_label", v.Resource.HostnameLabel)
 		v.D.Set("state", v.Resource.State)
 		v.D.Set("private_ip_address", v.Resource.PrivateIPAddress)
 		v.D.Set("public_ip_address", v.Resource.PublicIPAddress)

docs/Writing Terraform configurations for OBMCS.md

@@ -41,6 +41,15 @@ provider "baremetal" {
   private_key_path = "${var.private_key_path}"
 }
 ```
+
+To specify a different region, include the region parameter in your provider definition. Not specifying a value will use the default `us-phoenix-1` region. 
+```
+provider "baremetal" {
+  ...
+  region = "us-ashburn-1"
+}
+```
+
 ## CamelCase
 The OBMCS API uses CamelCase in multiple places. Terraform doesn't support CamelCase in configuration files so we've replaced it with underscores. For example -
 

docs/datasources/core/subnet.md

@@ -35,6 +35,7 @@ The following attributes are exported:
 * `security_list_ids` - OCIDs for the security lists to use for VNICs in this subnet.
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable.
 * `id` - The subnet's Oracle ID (OCID).
+* `prohibit_public_ip_on_vnic` - Whether VNICs within this subnet can have public IP addresses.
 * `vcn_id` - The OCID of the VCN the subnet is in.
 * `state` - The VCN's current state. [PROVISIONING, AVAILABLE, TERMINATING, TERMINATED]
 * `time_created` - The date and time the VCN was created.

docs/datasources/core/vnic.md

@@ -24,6 +24,7 @@ The following attributes are exported:
 * `availability_domain` - The VNIC's Availability Domain.
 * `display_name` - A user-friendly name. Does not have to be unique.
 * `id` - The OCID of the VNIC.
+* `hostname_label` - The hostname for the VNIC that is created during instance launch. Used for DNS. .
 * `state` - The current state of the VNIC. [PROVISIONING, AVAILABLE, TERMINATING, TERMINATED]
 * `private_ip_address` - The private IP addresses of the VNIC, which is within the VNIC subnet and is accessible within the VCN.
 * `public_ip_address` - The public IP address of the VNIC, which Oracle performs NAT for at the gateway.

docs/examples/compute/single-instance/block.tf

@@ -2,7 +2,7 @@ resource "baremetal_core_volume" "TFBlock0" {
   availability_domain = "${lookup(data.baremetal_identity_availability_domains.ADs.availability_domains[var.AD - 1],"name")}" 
   compartment_id = "${var.compartment_ocid}"
   display_name = "TFBlock0"
-  size_in_mbs = "${var.2TB}"
+  size_in_mbs = "${var.256GB}"
 }
 
 resource "baremetal_core_volume_attachment" "TFBlock0Attach" {

docs/examples/compute/single-instance/remote-exec.tf

@@ -1,15 +1,18 @@
 resource "null_resource" "remote-exec" {
-    depends_on = ["baremetal_core_instance.TFInstance"]
+    depends_on = ["baremetal_core_instance.TFInstance","baremetal_core_volume_attachment.TFBlock0Attach"]
     provisioner "remote-exec" {
       connection {
         agent = false
-        timeout = "10m"
+        timeout = "30m"
         host = "${data.baremetal_core_vnic.InstanceVnic.public_ip_address}"
         user = "opc"
         private_key = "${var.ssh_private_key}"
     }
       inline = [
         "touch ~/IMadeAFile.Right.Here",
+        "sudo iscsiadm -m node -o new -T ${baremetal_core_volume_attachment.TFBlock0Attach.iqn} -p ${baremetal_core_volume_attachment.TFBlock0Attach.ipv4}:${baremetal_core_volume_attachment.TFBlock0Attach.port}",
+        "sudo iscsiadm -m node -o update -T ${baremetal_core_volume_attachment.TFBlock0Attach.iqn} -n node.startup -v automatic",
+        "echo sudo iscsiadm -m node -T ${baremetal_core_volume_attachment.TFBlock0Attach.iqn} -p ${baremetal_core_volume_attachment.TFBlock0Attach.ipv4}:${baremetal_core_volume_attachment.TFBlock0Attach.port} -l >> ~/.bashrc"
       ]
     }
 }

docs/resources/core/instance.md

@@ -48,3 +48,6 @@ The following attributes are exported:
 * `region` - The region that contains the Availability Domain the instance is running in.
 * `shape` - The shape of the instance. The shape determines the number of CPUs and the amount of memory allocated to the instance.
 * `time_created` - The date and time the instance was created.
+
+* `public_ip` - The public ip of instance vnic (if enabled).
+* `private_ip` - The private ip of instance vnic (if enabled).