-
Notifications
You must be signed in to change notification settings - Fork 517
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
[RC2 fixes] fix cloudinit disk slot and pm_parallel oddities #947
Open
mleone87
wants to merge
6
commits into
master
Choose a base branch
from
rc2-fixes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
fef46ee
[RC2 fixes] fix cloudinit disk slot and pm_parallel oddities
mleone87 b7d266f
fix ide2 typos
mleone87 cffcb0f
remove duplicate defer
mleone87 8b58e42
cleanup
mleone87 fe55714
fix docs
mleone87 24c91e9
Merge branch 'master' into rc2-fixes
mleone87 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
|---|---|---|
| @@ -1,59 +1,59 @@ | ||
| provider "proxmox" { | ||
| pm_tls_insecure = true | ||
| pm_api_url = "https://proxmox-server01.example.com:8006/api2/json" | ||
| pm_password = "secret" | ||
| pm_user = "terraform-prov@pve" | ||
| pm_otp = "" | ||
| pm_tls_insecure = true | ||
| pm_api_url = "https://proxmox-server01.example.com:8006/api2/json" | ||
| pm_password = "secret" | ||
| pm_user = "terraform-prov@pve" | ||
| pm_otp = "" | ||
| } | ||
|
|
||
| resource "proxmox_vm_qemu" "cloudinit-test" { | ||
| name = "terraform-test-vm" | ||
| desc = "A test for using terraform and cloudinit" | ||
|
|
||
| # Node name has to be the same name as within the cluster | ||
| # this might not include the FQDN | ||
| target_node = "proxmox-server02" | ||
|
|
||
| # The destination resource pool for the new VM | ||
| pool = "pool0" | ||
|
|
||
| # The template name to clone this vm from | ||
| clone = "linux-cloudinit-template" | ||
|
|
||
| # Activate QEMU agent for this VM | ||
| agent = 1 | ||
|
|
||
| os_type = "cloud-init" | ||
| cores = 2 | ||
| sockets = 1 | ||
| vcpus = 0 | ||
| cpu = "host" | ||
| memory = 2048 | ||
| scsihw = "lsi" | ||
|
|
||
| # Setup the disk | ||
| disk { | ||
| size = 32 | ||
| type = "virtio" | ||
| storage = "ceph-storage-pool" | ||
| storage_type = "rbd" | ||
| iothread = 1 | ||
| ssd = 1 | ||
| discard = "on" | ||
| } | ||
|
|
||
| # Setup the network interface and assign a vlan tag: 256 | ||
| network { | ||
| model = "virtio" | ||
| bridge = "vmbr0" | ||
| tag = 256 | ||
| } | ||
|
|
||
| # Setup the ip address using cloud-init. | ||
| # Keep in mind to use the CIDR notation for the ip. | ||
| ipconfig0 = "ip=192.168.10.20/24,gw=192.168.10.1" | ||
|
|
||
| sshkeys = <<EOF | ||
| name = "terraform-test-vm" | ||
| desc = "A test for using terraform and cloudinit" | ||
|
|
||
| # Node name has to be the same name as within the cluster | ||
| # this might not include the FQDN | ||
| target_node = "proxmox-server02" | ||
|
|
||
| # The destination resource pool for the new VM | ||
| pool = "pool0" | ||
|
|
||
| # The template name to clone this VM from | ||
| clone = "linux-cloudinit-template" | ||
|
|
||
| # Activate QEMU agent for this VM | ||
| agent = 1 | ||
|
|
||
| os_type = "cloud-init" | ||
| cores = 2 | ||
| sockets = 1 | ||
| vcpus = 0 | ||
| cpu = "host" | ||
| memory = 2048 | ||
| scsihw = "lsi" | ||
|
|
||
| # Setup the disk | ||
| disk { | ||
| size = 32 | ||
| type = "virtio" | ||
| storage = "ceph-storage-pool" | ||
| storage_type = "rbd" | ||
| iothread = 1 | ||
| ssd = 1 | ||
| discard = "on" | ||
| } | ||
|
|
||
| # Setup the network interface and assign a vlan tag: 256 | ||
| network { | ||
| model = "virtio" | ||
| bridge = "vmbr0" | ||
| tag = 256 | ||
| } | ||
|
|
||
| # Setup the ip address using cloud-init. | ||
| # Keep in mind to use the CIDR notation for the ip. | ||
| ipconfig0 = "ip=192.168.10.20/24,gw=192.168.10.1" | ||
|
|
||
| sshkeys = <<EOF | ||
| ssh-rsa 9182739187293817293817293871== user@pc | ||
| EOF | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Somewhere in the docs it should say that
ide2is reserve, because of the change withe thecloud-initdisk.