Merge pull request #16695 from hashicorp/jbardin/inherit

reword inheritance upgrade guide
This commit is contained in:
James Bardin 2017-11-20 12:03:08 -05:00 committed by GitHub
commit 1efdc40a8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions

View File

@ -93,9 +93,12 @@ situations:
the descendent and the descendent no longer inherits attributes from the descendent and the descendent no longer inherits attributes from
its ancestor. Instead, each configuration is entirely distinct. its ancestor. Instead, each configuration is entirely distinct.
* Only unaliased provider configurations can be automatically inherited from * If a `provider` block is present in a child module, it must either contain a
ancestor modules. Aliased providers must be passed explicitly using complete configuration for its associated provider or a configuration must be
passed from the parent module using
[the new `providers` attribute](/docs/modules/usage.html#providers-within-modules). [the new `providers` attribute](/docs/modules/usage.html#providers-within-modules).
In the latter case, an empty provider block is a placeholder that declares
that the child module requires a configuration to be passed from its parent.
* When a module containing its own `provider` blocks is removed from its * When a module containing its own `provider` blocks is removed from its
parent module, Terraform will no longer attempt to associate it with parent module, Terraform will no longer attempt to associate it with
@ -143,8 +146,9 @@ With the above configuration, any `aws` provider resources in the module
`module.example-use1` and the us-west-1 provider configuration for `module.example-use1` and the us-west-1 provider configuration for
`module.example-usw1`. `module.example-usw1`.
When only default (non-aliased) providers are in use, automatic inheritance When a default (non-aliased) provider is used, and not explicitly
to child modules is still supported. declared in a child module, automatic inheritance of that provider is still
supported.
**Action**: In existing configurations where both a descendent module and **Action**: In existing configurations where both a descendent module and
one of its ancestor modules both configure the same provider, copy any one of its ancestor modules both configure the same provider, copy any