From 86a0fd49b6709ef22dffdd5715206e4f3bf027b8 Mon Sep 17 00:00:00 2001 From: Alex Kulikovskikh Date: Thu, 15 Oct 2020 19:51:02 -0400 Subject: [PATCH 1/3] Add Github Action for Terraform Registry --- .github/workflows/release.yaml | 47 +++++++++++++++++++++++++++++ .goreleaser.yml | 54 ++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 .github/workflows/release.yaml create mode 100644 .goreleaser.yml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000..9776db75 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,47 @@ +# This GitHub action can publish assets for release when a tag is created. +# Currently its setup to run on any tag that matches the pattern "v*" (ie. v0.1.0). +# +# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your +# private key in the `GPG_PRIVATE_KEY` secret and passphrase in the `PASSPHRASE` +# secret. If you would rather own your own GPG handling, please fork this action +# or use an alternative one for key handling. +# +# You will need to pass the `--batch` flag to `gpg` in your signing step +# in `goreleaser` to indicate this is being used in a non-interactive mode. +# +name: release +on: + push: + tags: + - 'v*' +jobs: + goreleaser: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Unshallow + run: git fetch --prune --unshallow + - + name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: 1.14 + - + name: Import GPG key + id: import_gpg + uses: paultyng/ghaction-import-gpg@v2.1.0 + env: + GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} + PASSPHRASE: ${{ secrets.PASSPHRASE }} + - + name: Run GoReleaser + uses: goreleaser/goreleaser-action@v2 + with: + version: latest + args: release --rm-dist + env: + GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yml b/.goreleaser.yml new file mode 100644 index 00000000..37845af0 --- /dev/null +++ b/.goreleaser.yml @@ -0,0 +1,54 @@ +# Visit https://goreleaser.com for documentation on how to customize this +# behavior. +before: + hooks: + # this is just an example and not a requirement for provider building/publishing + - go mod tidy +builds: +- env: + # goreleaser does not work with CGO, it could also complicate + # usage by users in CI/CD systems like Terraform Cloud where + # they are unable to install libraries. + - CGO_ENABLED=0 + mod_timestamp: '{{ .CommitTimestamp }}' + flags: + - -trimpath + ldflags: + - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}' + goos: + - freebsd + - windows + - linux + - darwin + goarch: + - amd64 + - '386' + - arm + - arm64 + ignore: + - goos: darwin + goarch: '386' + binary: '{{ .ProjectName }}_v{{ .Version }}' +archives: +- format: zip + name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}' +checksum: + name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS' + algorithm: sha256 +signs: + - artifacts: checksum + args: + # if you are using this is a GitHub action or some other automated pipeline, you + # need to pass the batch flag to indicate its not interactive. + - "--batch" + - "--local-user" + - "{{ .Env.GPG_FINGERPRINT }}" # set this environment variable for your signing key + - "--output" + - "${signature}" + - "--detach-sign" + - "${artifact}" +release: + # If you want to manually examine the release before its live, uncomment this line: + # draft: true +changelog: + skip: true \ No newline at end of file From dae62778ffe2e8259286c7b261baa1fbfd390c7c Mon Sep 17 00:00:00 2001 From: Alex Kulikovskikh Date: Thu, 22 Oct 2020 19:10:40 -0400 Subject: [PATCH 2/3] Update docs to support Terraform Registry --- .../datastores.md} | 5 ++--- .../dns.md} | 5 ++--- .../group.md} | 5 ++--- .../groups.md} | 5 ++--- .../hosts.md} | 5 ++--- .../index.md => data-sources/index.html} | 2 +- .../nodes.md} | 5 ++--- .../pool.md} | 5 ++--- .../pools.md} | 5 ++--- .../role.md} | 5 ++--- .../roles.md} | 5 ++--- .../time.md} | 5 ++--- .../user.md} | 5 ++--- .../users.md} | 5 ++--- .../version.md} | 5 ++--- docs/data_sources/virtual_environment/index.md | 10 ---------- docs/index.md | 16 ---------------- ...environment_certificate.md => certificate.md} | 5 ++--- ...ual_environment_container.md => container.md} | 5 ++--- ...proxmox_virtual_environment_dns.md => dns.md} | 5 ++--- ...oxmox_virtual_environment_file.md => file.md} | 5 ++--- ...mox_virtual_environment_group.md => group.md} | 5 ++--- ...mox_virtual_environment_hosts.md => hosts.md} | 5 ++--- docs/resources/{index.md => index.html} | 2 +- ...oxmox_virtual_environment_pool.md => pool.md} | 5 ++--- ...oxmox_virtual_environment_role.md => role.md} | 5 ++--- ...oxmox_virtual_environment_time.md => time.md} | 5 ++--- ...oxmox_virtual_environment_user.md => user.md} | 5 ++--- docs/resources/virtual_environment/index.md | 10 ---------- .../proxmox_virtual_environment_vm.md => vm.md} | 5 ++--- 30 files changed, 52 insertions(+), 113 deletions(-) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_datastores.md => data-sources/datastores.md} (86%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_dns.md => data-sources/dns.md} (76%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_group.md => data-sources/group.md} (83%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_groups.md => data-sources/groups.md} (77%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_hosts.md => data-sources/hosts.md} (82%) rename docs/{data_sources/index.md => data-sources/index.html} (88%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_nodes.md => data-sources/nodes.md} (86%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_pool.md => data-sources/pool.md} (83%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_pools.md => data-sources/pools.md} (75%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_role.md => data-sources/role.md} (75%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_roles.md => data-sources/roles.md} (79%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_time.md => data-sources/time.md} (79%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_user.md => data-sources/user.md} (87%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_users.md => data-sources/users.md} (85%) rename docs/{data_sources/virtual_environment/data_source_virtual_environment_version.md => data-sources/version.md} (80%) delete mode 100644 docs/data_sources/virtual_environment/index.md rename docs/resources/{virtual_environment/proxmox_virtual_environment_certificate.md => certificate.md} (93%) rename docs/resources/{virtual_environment/proxmox_virtual_environment_container.md => container.md} (98%) rename docs/resources/{virtual_environment/proxmox_virtual_environment_dns.md => dns.md} (89%) rename docs/resources/{virtual_environment/proxmox_virtual_environment_file.md => file.md} (94%) rename docs/resources/{virtual_environment/proxmox_virtual_environment_group.md => group.md} (85%) rename docs/resources/{virtual_environment/proxmox_virtual_environment_hosts.md => hosts.md} (88%) rename docs/resources/{index.md => index.html} (87%) rename docs/resources/{virtual_environment/proxmox_virtual_environment_pool.md => pool.md} (84%) rename docs/resources/{virtual_environment/proxmox_virtual_environment_role.md => role.md} (80%) rename docs/resources/{virtual_environment/proxmox_virtual_environment_time.md => time.md} (81%) rename docs/resources/{virtual_environment/proxmox_virtual_environment_user.md => user.md} (92%) delete mode 100644 docs/resources/virtual_environment/index.md rename docs/resources/{virtual_environment/proxmox_virtual_environment_vm.md => vm.md} (99%) diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_datastores.md b/docs/data-sources/datastores.md similarity index 86% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_datastores.md rename to docs/data-sources/datastores.md index 9a6f9cde..ab13f8eb 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_datastores.md +++ b/docs/data-sources/datastores.md @@ -1,10 +1,9 @@ --- layout: page title: Datastores -permalink: /data-sources/virtual-environment/datastores +permalink: /data-sources/datastores nav_order: 1 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Datastores diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_dns.md b/docs/data-sources/dns.md similarity index 76% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_dns.md rename to docs/data-sources/dns.md index d849502f..454110f6 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_dns.md +++ b/docs/data-sources/dns.md @@ -1,10 +1,9 @@ --- layout: page title: DNS -permalink: /data-sources/virtual-environment/dns +permalink: /data-sources/dns nav_order: 2 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: DNS diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_group.md b/docs/data-sources/group.md similarity index 83% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_group.md rename to docs/data-sources/group.md index d82bb62c..d62b75e6 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_group.md +++ b/docs/data-sources/group.md @@ -1,10 +1,9 @@ --- layout: page title: Group -permalink: /data-sources/virtual-environment/group +permalink: /data-sources/group nav_order: 3 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Group diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_groups.md b/docs/data-sources/groups.md similarity index 77% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_groups.md rename to docs/data-sources/groups.md index cf4e09e1..7df96779 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_groups.md +++ b/docs/data-sources/groups.md @@ -1,10 +1,9 @@ --- layout: page title: Groups -permalink: /data-sources/virtual-environment/groups +permalink: /data-sources/groups nav_order: 4 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Groups diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_hosts.md b/docs/data-sources/hosts.md similarity index 82% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_hosts.md rename to docs/data-sources/hosts.md index 044fe2f8..84e1c6fc 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_hosts.md +++ b/docs/data-sources/hosts.md @@ -1,10 +1,9 @@ --- layout: page title: Hosts -permalink: /data-sources/virtual-environment/hosts +permalink: /data-sources/hosts nav_order: 5 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Hosts diff --git a/docs/data_sources/index.md b/docs/data-sources/index.html similarity index 88% rename from docs/data_sources/index.md rename to docs/data-sources/index.html index d2695eb9..27061e02 100644 --- a/docs/data_sources/index.md +++ b/docs/data-sources/index.html @@ -2,7 +2,7 @@ layout: page title: Data Sources permalink: /data-sources -nav_order: 2 +nav_order: 3 has_children: true --- diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_nodes.md b/docs/data-sources/nodes.md similarity index 86% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_nodes.md rename to docs/data-sources/nodes.md index 4631056c..17cb75c2 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_nodes.md +++ b/docs/data-sources/nodes.md @@ -1,10 +1,9 @@ --- layout: page title: Nodes -permalink: /data-sources/virtual-environment/nodes +permalink: /data-sources/nodes nav_order: 6 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Nodes diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_pool.md b/docs/data-sources/pool.md similarity index 83% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_pool.md rename to docs/data-sources/pool.md index d919b3d7..59a768ee 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_pool.md +++ b/docs/data-sources/pool.md @@ -1,10 +1,9 @@ --- layout: page title: Pool -permalink: /data-sources/virtual-environment/pool +permalink: /data-sources/pool nav_order: 7 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Pool diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_pools.md b/docs/data-sources/pools.md similarity index 75% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_pools.md rename to docs/data-sources/pools.md index 28074d94..ba6aa53e 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_pools.md +++ b/docs/data-sources/pools.md @@ -1,10 +1,9 @@ --- layout: page title: Pools -permalink: /data-sources/virtual-environment/pools +permalink: /data-sources/pools nav_order: 8 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Pools diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_role.md b/docs/data-sources/role.md similarity index 75% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_role.md rename to docs/data-sources/role.md index 26d15f4d..c412383c 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_role.md +++ b/docs/data-sources/role.md @@ -1,10 +1,9 @@ --- layout: page title: Role -permalink: /data-sources/virtual-environment/role +permalink: /data-sources/role nav_order: 9 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Role diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_roles.md b/docs/data-sources/roles.md similarity index 79% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_roles.md rename to docs/data-sources/roles.md index af7c9b28..e9187eb3 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_roles.md +++ b/docs/data-sources/roles.md @@ -1,10 +1,9 @@ --- layout: page title: Roles -permalink: /data-sources/virtual-environment/roles +permalink: /data-sources/roles nav_order: 10 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Roles diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_time.md b/docs/data-sources/time.md similarity index 79% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_time.md rename to docs/data-sources/time.md index 54fc08a3..93f39aa6 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_time.md +++ b/docs/data-sources/time.md @@ -1,10 +1,9 @@ --- layout: page title: Time -permalink: /data-sources/virtual-environment/time +permalink: /data-sources/time nav_order: 11 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Time diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_user.md b/docs/data-sources/user.md similarity index 87% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_user.md rename to docs/data-sources/user.md index a6338b07..1e37871d 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_user.md +++ b/docs/data-sources/user.md @@ -1,10 +1,9 @@ --- layout: page title: User -permalink: /data-sources/virtual-environment/user +permalink: /data-sources/user nav_order: 12 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: User diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_users.md b/docs/data-sources/users.md similarity index 85% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_users.md rename to docs/data-sources/users.md index 6259ed42..7b1a2f49 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_users.md +++ b/docs/data-sources/users.md @@ -1,10 +1,9 @@ --- layout: page title: Users -permalink: /data-sources/virtual-environment/users +permalink: /data-sources/users nav_order: 13 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Users diff --git a/docs/data_sources/virtual_environment/data_source_virtual_environment_version.md b/docs/data-sources/version.md similarity index 80% rename from docs/data_sources/virtual_environment/data_source_virtual_environment_version.md rename to docs/data-sources/version.md index 700dc88f..d3217ddb 100644 --- a/docs/data_sources/virtual_environment/data_source_virtual_environment_version.md +++ b/docs/data-sources/version.md @@ -1,10 +1,9 @@ --- layout: page title: Version -permalink: /data-sources/virtual-environment/version +permalink: /data-sources/version nav_order: 14 -parent: Virtual Environment Data Sources -grand_parent: Data Sources +parent: Data Sources --- # Data Source: Version diff --git a/docs/data_sources/virtual_environment/index.md b/docs/data_sources/virtual_environment/index.md deleted file mode 100644 index 9e0eea09..00000000 --- a/docs/data_sources/virtual_environment/index.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: page -title: Virtual Environment Data Sources -permalink: /data-sources/virtual-environment -nav_order: 1 -parent: Data Sources -has_children: true ---- - -# Virtual Environment Data Sources diff --git a/docs/index.md b/docs/index.md index 48f99181..d819239a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -23,22 +23,6 @@ provider "proxmox" { } ``` -## Installation - -You can install the latest release of the provider using either Git Bash or regular Bash: - -```sh -$ export PROVIDER_PLATFORM="$([[ "$OSTYPE" =~ ^msys|cygwin$ ]] && echo "windows" || ([[ "$OSTYPE" == "darwin"* ]] && echo "darwin" || ([[ "$OSTYPE" == "linux"* ]] && echo "linux" || echo "unsupported")))" -$ export PROVIDER_VERSION="$(curl -L -s -H 'Accept: application/json' https://github.com/danitso/terraform-provider-proxmox/releases/latest | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/')" -$ export PLUGINS_PATH="$([[ "$PROVIDER_PLATFORM" == "windows" ]] && cygpath -u "$APPDATA" || echo "$HOME")/terraform.d/plugins" -$ mkdir -p "$PLUGINS_PATH" -$ curl -o "${PLUGINS_PATH}/terraform-provider-proxmox_v${PROVIDER_VERSION}.zip" -sL "https://github.com/danitso/terraform-provider-proxmox/releases/download/${PROVIDER_VERSION}/terraform-provider-proxmox_v${PROVIDER_VERSION}-custom_${PROVIDER_PLATFORM}_amd64.zip" -$ unzip -o -d "$PLUGINS_PATH" "${PLUGINS_PATH}/terraform-provider-proxmox_v${PROVIDER_VERSION}.zip" -$ rm "${PLUGINS_PATH}/terraform-provider-proxmox_v${PROVIDER_VERSION}.zip" -``` - -You can also install it manually by following the instructions to [install it as a plugin](https://www.terraform.io/docs/plugins/basics.html#installing-plugins). You can download the latest release from the [releases](https://github.com/danitso/terraform-provider-proxmox/releases) page. - ## Authentication The Proxmox provider offers a flexible means of providing credentials for authentication. The following methods are supported, in this order, and explained below: diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_certificate.md b/docs/resources/certificate.md similarity index 93% rename from docs/resources/virtual_environment/proxmox_virtual_environment_certificate.md rename to docs/resources/certificate.md index f8c0bc7e..15fe9d7f 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_certificate.md +++ b/docs/resources/certificate.md @@ -1,10 +1,9 @@ --- layout: page title: Certificate -permalink: /ressources/virtual-environment/certificate +permalink: /resources/certificate nav_order: 1 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: Certificate diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_container.md b/docs/resources/container.md similarity index 98% rename from docs/resources/virtual_environment/proxmox_virtual_environment_container.md rename to docs/resources/container.md index d6272fcb..1dc03433 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_container.md +++ b/docs/resources/container.md @@ -1,10 +1,9 @@ --- layout: page title: Container -permalink: /ressources/virtual-environment/container +permalink: /resources/container nav_order: 2 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: Container diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_dns.md b/docs/resources/dns.md similarity index 89% rename from docs/resources/virtual_environment/proxmox_virtual_environment_dns.md rename to docs/resources/dns.md index ec66adc7..5f4babf0 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_dns.md +++ b/docs/resources/dns.md @@ -1,10 +1,9 @@ --- layout: page title: DNS -permalink: /ressources/virtual-environment/dns +permalink: /resources/dns nav_order: 3 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: DNS diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_file.md b/docs/resources/file.md similarity index 94% rename from docs/resources/virtual_environment/proxmox_virtual_environment_file.md rename to docs/resources/file.md index df11f129..17c285a6 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_file.md +++ b/docs/resources/file.md @@ -1,10 +1,9 @@ --- layout: page title: File -permalink: /ressources/virtual-environment/file +permalink: /resources/file nav_order: 4 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: File diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_group.md b/docs/resources/group.md similarity index 85% rename from docs/resources/virtual_environment/proxmox_virtual_environment_group.md rename to docs/resources/group.md index e5ddfa7e..8a8cdc3d 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_group.md +++ b/docs/resources/group.md @@ -1,10 +1,9 @@ --- layout: page title: Group -permalink: /ressources/virtual-environment/group +permalink: /resources/group nav_order: 5 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: Group diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_hosts.md b/docs/resources/hosts.md similarity index 88% rename from docs/resources/virtual_environment/proxmox_virtual_environment_hosts.md rename to docs/resources/hosts.md index 81b0c1b3..5e02a634 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_hosts.md +++ b/docs/resources/hosts.md @@ -1,10 +1,9 @@ --- layout: page title: Hosts -permalink: /ressources/virtual-environment/hosts +permalink: /resources/hosts nav_order: 6 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: Hosts diff --git a/docs/resources/index.md b/docs/resources/index.html similarity index 87% rename from docs/resources/index.md rename to docs/resources/index.html index bc999921..12716077 100644 --- a/docs/resources/index.md +++ b/docs/resources/index.html @@ -2,7 +2,7 @@ layout: page title: Resources permalink: /resources -nav_order: 3 +nav_order: 2 has_children: true --- diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_pool.md b/docs/resources/pool.md similarity index 84% rename from docs/resources/virtual_environment/proxmox_virtual_environment_pool.md rename to docs/resources/pool.md index 5af936f4..be48ab0c 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_pool.md +++ b/docs/resources/pool.md @@ -1,10 +1,9 @@ --- layout: page title: Pool -permalink: /ressources/virtual-environment/pool +permalink: /resources/pool nav_order: 7 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: Pool diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_role.md b/docs/resources/role.md similarity index 80% rename from docs/resources/virtual_environment/proxmox_virtual_environment_role.md rename to docs/resources/role.md index 108f9565..17f12068 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_role.md +++ b/docs/resources/role.md @@ -1,10 +1,9 @@ --- layout: page title: Role -permalink: /ressources/virtual-environment/role +permalink: /resources/role nav_order: 8 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: Role diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_time.md b/docs/resources/time.md similarity index 81% rename from docs/resources/virtual_environment/proxmox_virtual_environment_time.md rename to docs/resources/time.md index c124386c..8642a65e 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_time.md +++ b/docs/resources/time.md @@ -1,10 +1,9 @@ --- layout: page title: Time -permalink: /ressources/virtual-environment/time +permalink: /resources/time nav_order: 9 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: Time diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_user.md b/docs/resources/user.md similarity index 92% rename from docs/resources/virtual_environment/proxmox_virtual_environment_user.md rename to docs/resources/user.md index e40dd67a..c4ed020c 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_user.md +++ b/docs/resources/user.md @@ -1,10 +1,9 @@ --- layout: page title: User -permalink: /ressources/virtual-environment/user +permalink: /resources/user nav_order: 10 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: User diff --git a/docs/resources/virtual_environment/index.md b/docs/resources/virtual_environment/index.md deleted file mode 100644 index e1e34954..00000000 --- a/docs/resources/virtual_environment/index.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: page -title: Virtual Environment Resources -permalink: /resources/virtual-environment -nav_order: 1 -parent: Resources -has_children: true ---- - -# Virtual Environment Resources diff --git a/docs/resources/virtual_environment/proxmox_virtual_environment_vm.md b/docs/resources/vm.md similarity index 99% rename from docs/resources/virtual_environment/proxmox_virtual_environment_vm.md rename to docs/resources/vm.md index 4445cdde..ec779d10 100644 --- a/docs/resources/virtual_environment/proxmox_virtual_environment_vm.md +++ b/docs/resources/vm.md @@ -1,10 +1,9 @@ --- layout: page title: VM -permalink: /ressources/virtual-environment/vm +permalink: /resources/vm nav_order: 11 -parent: Virtual Environment Resources -grand_parent: Resources +parent: Resources --- # Resource: VM From b08e4cc55fa1a1cb3f08b34be4c13bed89f2d440 Mon Sep 17 00:00:00 2001 From: Alex Kulikovskikh Date: Mon, 9 Nov 2020 18:58:58 -0500 Subject: [PATCH 3/3] Update vm.md Due to merge [#46](https://github.com/danitso/terraform-provider-proxmox/pull/46/files) --- docs/resources/vm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/resources/vm.md b/docs/resources/vm.md index ec779d10..b904faba 100644 --- a/docs/resources/vm.md +++ b/docs/resources/vm.md @@ -184,7 +184,7 @@ output "ubuntu_vm_public_key" { * `read_burstable` - (Optional) The maximum burstable read speed in megabytes per second. * `write` - (Optional) The maximum write speed in megabytes per second. * `write_burstable` - (Optional) The maximum burstable write speed in megabytes per second. -* `initialization` - (Optional) The cloud-init configuration (conflicts with `cdrom`). +* `initialization` - (Optional) The cloud-init configuration. * `datastore_id` - (Optional) The identifier for the datastore to create the cloud-init disk in (defaults to `local-lvm`). * `dns` - (Optional) The DNS configuration. * `domain` - (Optional) The DNS search domain.