Merge pull request #9830 from fatmcgav/openstack_fw_policy_shared_fix

provider/openstack: Don't default 'shared' value, instead only set if…

builtin/providers/openstack/resource_openstack_fw_policy_v1.go

@@ -44,7 +44,6 @@ func resourceFWPolicyV1() *schema.Resource {
 			"shared": &schema.Schema{
 				Type:     schema.TypeBool,
 				Optional: true,
-				Default:  false,
 			},
 			"tenant_id": &schema.Schema{
 				Type:     schema.TypeString,
@@ -79,17 +78,20 @@ func resourceFWPolicyV1Create(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	audited := d.Get("audited").(bool)
-	shared := d.Get("shared").(bool)
 
 	opts := policies.CreateOpts{
 		Name:        d.Get("name").(string),
 		Description: d.Get("description").(string),
 		Audited:     &audited,
-		Shared:      &shared,
 		TenantID:    d.Get("tenant_id").(string),
 		Rules:       rules,
 	}
 
+	if r, ok := d.GetOk("shared"); ok {
+		shared := r.(bool)
+		opts.Shared = &shared
+	}
+
 	log.Printf("[DEBUG] Create firewall policy: %#v", opts)
 
 	policy, err := policies.Create(networkingClient, opts).Extract()

website/source/docs/providers/openstack/r/fw_policy_v1.html.markdown

@@ -64,9 +64,10 @@ The following arguments are supported:
     firewall policy.
 
 * `shared` - (Optional) Sharing status of the firewall policy (must be "true"
-    or "false" if provided - defaults to "false"). If this is "true" the policy
+    or "false" if provided). If this is "true" the policy is visible to, and
-    is visible to, and can be used in, firewalls in other tenants. Changing this
+    can be used in, firewalls in other tenants. Changing this updates the
-    updates the `shared` status of an existing firewall policy.
+    `shared` status of an existing firewall policy. Only administrative users
+    can specify if the policy should be shared.
 
 ## Attributes Reference