-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13 from mengesb/chef_breakup
Breakup of chef map variable
- Loading branch information
Showing
6 changed files
with
108 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,19 +114,22 @@ to delete the resources. | |
| * `certificate`: The uploaded identifier for the SSL certificate to use with AWS ELB | ||
| * `hostname`: Basename for the hostname. Default: `chefelb` | ||
| * `tags_desc`: Default tag for ELB. Default: `Created using Terraform` | ||
| * `chef`: Chef settings | ||
| * `accept_mlsa`: Indicate acceptance of the Chef MLSA. Must update to `true`. Default: `false` | ||
| * `client_version`: Chef client version to install. Default: `12.12.15` | ||
| * `backend_count`: Count of chef-backend instances to deploy. Default: `4` | ||
| * `backend_version`: Chef backend version to install. Default: `1.0.9` | ||
| * `frontend_count`: Chef server core instance count. Default: `4` | ||
| * `frontend_version`: Chef server core version to install. Default: `12.8.0` | ||
| * `org`: Chef organization to create. Default: `chef` | ||
| * `org_long`: Chef long organization name. Default: `Chef Organization` | ||
| * `chef_backend`: Chef backend settings | ||
| * `count`: Count of chef-backend instances to deploy. Default: `4` | ||
| * `version`: Chef backend version to install. Default: `1.0.9` | ||
| * `chef_client`: Chef client version to install. Default: `12.12.15` | ||
| * `chef_mlsa`: Indicate acceptance of the Chef MLSA. Must update to `true`. Default: `false` | ||
| * `chef_org`: Chef organization settings | ||
| * `short`: Chef organization to create. Default: `chef` | ||
| * `long`: Chef long organization name. Default: `Chef Organization` | ||
| * `chef_server`: Chef server core settings | ||
| * `count`: Chef server core instance count. Default: `4` | ||
| * `version`: Chef server core version to install. Default: `12.8.0` | ||
| * `chef_user`: Chef initial user settings | ||
| * `username`: Chef username to create. Default: `chef` | ||
| * `user_email`: Chef user e-mail address. Default: `[email protected]` | ||
| * `user_firstname`: Chef user first name. Default: `Chef` | ||
| * `user_lastname`: Chef user last name. Default: `User` | ||
| * `email`: Chef user e-mail address. Default: `[email protected]` | ||
| * `first_name`: Chef user first name. Default: `Chef` | ||
| * `last_name`: Chef user last name. Default: `User` | ||
| * `instance`: Map of various AWS instance settings (backend and frontend) | ||
| * `backend_flavor`: Backend default instance type. Default: `r3.xlarge` | ||
| * `backend_iops`: Backend root volume IOPs (when using `io1`). Default: `6000` | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -89,20 +89,26 @@ ssl_certificate = { | |
| # | ||
| # Chef settings | ||
| # | ||
| chef = { | ||
| accept_mlsa = false # UPDATE THIS! | ||
| client_version = "12.12.15" | ||
| backend_count = 4 | ||
| backend_version = "1.0.9" | ||
| frontend_count = 4 | ||
| frontend_version = "12.8.0" | ||
| org = "chef" | ||
| org_long = "Chef Organization" | ||
| username = "chef" | ||
| user_firstname = "Chef" | ||
| user_lastnname = "User" | ||
| user_email = "[email protected]" | ||
| } | ||
| #chef_backend = { | ||
| # count = 4 | ||
| # version = "1.1.12" | ||
| #} | ||
| #chef_client = "12.12.15" | ||
| chef_mlsa = "false" # Must update this to true! | ||
| #chef_org = { | ||
| # short = "chef" | ||
| # long = "Chef Organization" | ||
| #} | ||
| #chef_server = { | ||
| # count = 4 | ||
| # version = "12.8.0" | ||
| #} | ||
| #chef_user = { | ||
| # username = "chef" | ||
| # first_name = "Chef" | ||
| # last_nname = "User" | ||
| # email = "[email protected]" | ||
| #} | ||
| # | ||
| # AWS Route53 settings | ||
| # | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -221,24 +221,50 @@ variable "elb" { | |
| # | ||
| # Chef settings | ||
| # | ||
| variable "chef" { | ||
| variable "chef_backend" { | ||
| type = "map" | ||
| description = "Various Chef related settings" | ||
| description = "Chef backend settings" | ||
| default = { | ||
| accept_mlsa = false | ||
| client_version = "12.12.15" | ||
| backend_count = 4 | ||
| backend_version = "1.0.9" | ||
| frontend_count = 4 | ||
| frontend_version = "12.8.0" | ||
| org = "chef" | ||
| org_long = "Chef Organization" | ||
| count = 4 | ||
| version = "1.1.12" | ||
| } | ||
| } | ||
| variable "chef_server" { | ||
| type = "map" | ||
| description = "Chef server core settings" | ||
| default = { | ||
| count = 4 | ||
| version = "12.8.0" | ||
| } | ||
| } | ||
| variable "chef_user" { | ||
| type = "map" | ||
| description = "Chef user creation settings" | ||
| default = { | ||
| email = "[email protected]" | ||
| first_name = "Chef" | ||
| last_name = "User" | ||
| username = "chef" | ||
| user_email = "[email protected]" | ||
| user_firstname = "Chef" | ||
| user_lastname = "User" | ||
| } | ||
| } | ||
| variable "chef_org" { | ||
| type = "map" | ||
| description = "Chef organization settings" | ||
| default = { | ||
| short = "chef" | ||
| long = "Chef Organization" | ||
| } | ||
| } | ||
| variable "chef_client" { | ||
| type = "string" | ||
| description = "Chef client version" | ||
| default = "12.12.15" | ||
| } | ||
| variable "chef_mlsa" { | ||
| # type = "string" | ||
| description = "Chef MLSA license agreement" | ||
| default = false | ||
| } | ||
| # | ||
| # AWS EC2 instance settings | ||
| # | ||
|
|
||