Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

provider/aws: OpsWorks updates #12979

Merged
merged 2 commits into from
Mar 22, 2017
Merged

provider/aws: OpsWorks updates #12979

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d0655a
provider/aws: Opsworks updates to allow minimal configuration
catsby Mar 22, 2017
b1101a2
update
catsby Mar 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion builtin/providers/aws/resource_aws_opsworks_stack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func resourceAwsOpsworksStack() *schema.Resource {
"configuration_manager_version": {
Type: schema.TypeString,
Optional: true,
Default: "11.4",
Default: "11.10",
},

"manage_berkshelf": {
Expand Down Expand Up @@ -156,6 +156,7 @@ func resourceAwsOpsworksStack() *schema.Resource {
"default_subnet_id": {
Type: schema.TypeString,
Optional: true,
Computed: true,
},

"hostname_theme": {
Expand All @@ -179,6 +180,7 @@ func resourceAwsOpsworksStack() *schema.Resource {
"vpc_id": {
Type: schema.TypeString,
ForceNew: true,
Computed: true,
Optional: true,
},
},
Expand Down Expand Up @@ -431,10 +433,12 @@ func resourceAwsOpsworksStackUpdate(d *schema.ResourceData, meta interface{}) er
if v, ok := d.GetOk("color"); ok {
req.Attributes["Color"] = aws.String(v.(string))
}

req.ChefConfiguration = &opsworks.ChefConfiguration{
BerkshelfVersion: aws.String(d.Get("berkshelf_version").(string)),
ManageBerkshelf: aws.Bool(d.Get("manage_berkshelf").(bool)),
}

req.ConfigurationManager = &opsworks.StackConfigurationManager{
Name: aws.String(d.Get("configuration_manager_name").(string)),
Version: aws.String(d.Get("configuration_manager_version").(string)),
Expand Down