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.

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

Amaslows addv12mods #5

Open
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

riselka
Copy link
Contributor

@riselka riselka commented Jul 5, 2019

Summary of changes:

Errata:

  • vault.tf - fixed the display_name to vault from consul (last change was only on vnic label)

v12 Changes:

  • all variables.tf files
    • commented 3.1.0 oci reference (incompat with v12), terraform init will pull latest compat oci provider
    • fixed any remote_state references to new syntax with outputs level
    • removed a couple S3 skip settings that are deprecated
  • all other tf files
    • updated to new remote_state datasource syntax with outputs level
    • fixed vault_subnets datasource to include an extra [] for the new tuple level in the datasource

riselka added 9 commits July 5, 2019 09:46
comments out the version setting to 3.1.0 as this oci provider version does not support terraform v12.  removing it allows terraform init to pull the latest oci plugin that works with v12.
reset some vaules back to the original project defaults, removes some validation skip that show a warning in v12 stating they are no longer done and don't need skipping.
removed version pin to oci 3.1.0 provider, removed deprecated skips on s3 checks
v11 syntax: compartment_id = "${data.terraform_remote_state.common.network_compartment}"
v12 syntax: compartment_id = data.terraform_remote_state.common.outputs.network_compartment
v12 syntax: compartment_id = data.terraform_remote_state.common.outputs.network_compartment
remove 3.1.0 oci plugin version pinning, fix remote_state references to include outputs
Fixed subnet references to work with v12:
subnet_id        = data.terraform_remote_state.network.outputs.vault_subnets[0][lookup(var.consul_node_to_ad_map, count.index, 1) - 1]

vault_subnets for some reason is now a tuple of tuples so needs an extra [0] for first tuple:
    "vault_subnets": {
      "value": [
        [
          "ocid1.subnet.oc1.iad.cba",
          "ocid1.subnet.oc1.iad.bca",
          "ocid1.subnet.oc1.iad.abc"
        ]
      ],
v12 syntax:     subnet_id        = data.terraform_remote_state.network.outputs.vault_subnets[0][count.index]
- also fixed display_name and hostname_lable to 'vault' from consul
first change only fixed the vnic hostname_label (my mistake)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant