From 68a6e7197ffb571aafc2819e838a0f0fb9b9a136 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Tue, 13 Jan 2015 11:28:05 +0100 Subject: [PATCH] Adding some needed references and updated a couple of passes --- website/source/assets/stylesheets/_docs.scss | 1 + .../cloudstack/r/instance.html.markdown | 10 ++-- .../cloudstack/r/network_acl.html.markdown | 53 +++++-------------- .../r/network_acl_rule.html.markdown | 2 +- website/source/layouts/cloudstack.erb | 4 +- website/source/layouts/docs.erb | 4 ++ 6 files changed, 26 insertions(+), 48 deletions(-) diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss index b627189441..a0d2ce8071 100755 --- a/website/source/assets/stylesheets/_docs.scss +++ b/website/source/assets/stylesheets/_docs.scss @@ -10,6 +10,7 @@ body.layout-atlas, body.layout-consul, body.layout-dnsimple, body.layout-cloudflare, +body.layout-cloudstack, body.layout-google, body.layout-heroku, body.layout-mailgun, diff --git a/website/source/docs/providers/cloudstack/r/instance.html.markdown b/website/source/docs/providers/cloudstack/r/instance.html.markdown index 7b550400cf..af9efd4239 100644 --- a/website/source/docs/providers/cloudstack/r/instance.html.markdown +++ b/website/source/docs/providers/cloudstack/r/instance.html.markdown @@ -15,11 +15,11 @@ disk offering, and template. ``` resource "cloudstack_instance" "web" { - ami = "ami-1234" - instance_type = "m1.small" - tags { - Name = "HelloWorld" - } + name = "server-1" + service_offering= "small" + network = "network-1" + template = "CentOS 6.5" + zone = "zone-1" } ``` diff --git a/website/source/docs/providers/cloudstack/r/network_acl.html.markdown b/website/source/docs/providers/cloudstack/r/network_acl.html.markdown index 95eced1f36..afead04ee6 100644 --- a/website/source/docs/providers/cloudstack/r/network_acl.html.markdown +++ b/website/source/docs/providers/cloudstack/r/network_acl.html.markdown @@ -1,38 +1,21 @@ --- -layout: "aws" -page_title: "AWS: aws_network_acl" -sidebar_current: "docs-aws-resource-network-acl" +layout: "cloudstack" +page_title: "CloudStack: cloudstack_network_acl" +sidebar_current: "docs-cloudstack-resource-network-acl" description: |- - Provides an network ACL resource. + Creates a Network ACL for the given VPC. --- -# aws\_network\_acl +# cloudstack\_network\_acl -Provides an network ACL resource. You might set up network ACLs with rules similar -to your security groups in order to add an additional layer of security to your VPC. +Creates a Network ACL for the given VPC. ## Example Usage ``` -resource "aws_network_acl" "main" { - vpc_id = "${aws_vpc.main.id}" - egress = { - protocol = "tcp" - rule_no = 2 - action = "allow" - cidr_block = "10.3.2.3/18" - from_port = 443 - to_port = 443 - } - - ingress = { - protocol = "tcp" - rule_no = 1 - action = "allow" - cidr_block = "10.3.10.3/18" - from_port = 80 - to_port = 80 - } +resource "cloudstack_network_acl" "default" { + name = "test-acl" + vpc = "vpc-1" } ``` @@ -40,23 +23,13 @@ resource "aws_network_acl" "main" { The following arguments are supported: -* `vpc_id` - (Required) The ID of the associated VPC. -* `subnet_id` - (Optional) The ID of the associated subnet. -* `ingress` - (Optional) Specifies an ingress rule. Parameters defined below. -* `egress` - (Optional) Specifies an egress rule. Parameters defined below. - -Both `egress` and `ingress` support the following keys: - -* `from_port` - (Required) The from port to match. -* `to_port` - (Required) The to port to match. -* `rule_no` - (Required) The rule number. Used for ordering. -* `action` - (Required) The action to take. -* `protocol` - (Required) The protocol to match. -* `cidr_block` - (Optional) The CIDR block to match. +* `name` - (Required) The name of the ACL. Changing this forces a new resource to be created. +* `description` - (Optional) The description of the ACL. Changing this forces a new resource to be created. +* `vpc` - (Required) The name of the VPC to create this ACL for. Changing this forces a new resource to be created. ## Attributes Reference The following attributes are exported: -* `id` - The ID of the network ACL +* `id` - The ID of the Network ACL diff --git a/website/source/docs/providers/cloudstack/r/network_acl_rule.html.markdown b/website/source/docs/providers/cloudstack/r/network_acl_rule.html.markdown index 2771a31e93..38f13520f7 100644 --- a/website/source/docs/providers/cloudstack/r/network_acl_rule.html.markdown +++ b/website/source/docs/providers/cloudstack/r/network_acl_rule.html.markdown @@ -1,7 +1,7 @@ --- layout: "cloudstack" page_title: "CloudStack: cloudstack_network_acl_rule" -sidebar_current: "docs-cloudstack-resource-network_acl_rule" +sidebar_current: "docs-cloudstack-resource-network-acl-rule" description: |- Creates network ACL rules for a given network ACL. --- diff --git a/website/source/layouts/cloudstack.erb b/website/source/layouts/cloudstack.erb index a74abdeacc..4c0a7f5b53 100644 --- a/website/source/layouts/cloudstack.erb +++ b/website/source/layouts/cloudstack.erb @@ -33,11 +33,11 @@ cloudstack_network - > + > cloudstack_network_acl - > + > cloudstack_network_acl_rule diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 298ef0875b..c71ac5a2eb 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -116,6 +116,10 @@ CloudFlare + > + CloudStack + + > Consul