mirror of
https://github.com/letic/terraform-provider-proxmox.git
synced 2024-10-05 02:01:04 +00:00
support auto_resize and fix for secure sudo env
This commit is contained in:
parent
c471e31532
commit
624169e7b7
10
README.md
10
README.md
@ -3,12 +3,7 @@
|
|||||||
Terraform provider plugin for proxmox
|
Terraform provider plugin for proxmox
|
||||||
|
|
||||||
|
|
||||||
## Work in progress
|
## Working prototype
|
||||||
|
|
||||||
### TODO
|
|
||||||
|
|
||||||
* document terraform-ubuntu1404-template creation process
|
|
||||||
* implement pre-provision phase
|
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
@ -19,6 +14,9 @@ go build -o terraform-provider-proxmox
|
|||||||
cp terraform-provider-proxmox $GOPATH/bin
|
cp terraform-provider-proxmox $GOPATH/bin
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Recommended ISO builder https://github.com/Telmate/terraform-ubuntu-proxmox-iso
|
||||||
|
|
||||||
|
|
||||||
## Run
|
## Run
|
||||||
|
|
||||||
```
|
```
|
||||||
|
@ -20,6 +20,7 @@ const provisionPayload = "echo $'%s' > /tmp/tf_preprovision.sh"
|
|||||||
const ubuntuPreprovisionScript = `
|
const ubuntuPreprovisionScript = `
|
||||||
BOX_HOSTNAME=%s
|
BOX_HOSTNAME=%s
|
||||||
BOX_SHORT_HOSTNAME=%s
|
BOX_SHORT_HOSTNAME=%s
|
||||||
|
SSH_CLIENT=$1
|
||||||
MY_IP=$(echo $SSH_CLIENT | awk "{ print \$1 }")
|
MY_IP=$(echo $SSH_CLIENT | awk "{ print \$1 }")
|
||||||
echo Using my ip $MY_IP to provision at $(date)
|
echo Using my ip $MY_IP to provision at $(date)
|
||||||
if [ -z "$(grep $BOX_SHORT_HOSTNAME /etc/hosts)" ]; then
|
if [ -z "$(grep $BOX_SHORT_HOSTNAME /etc/hosts)" ]; then
|
||||||
@ -41,6 +42,10 @@ echo Attempting to bring up eth0
|
|||||||
ip route add $MY_IP via 10.0.2.2
|
ip route add $MY_IP via 10.0.2.2
|
||||||
ip route del default via 10.0.2.2
|
ip route del default via 10.0.2.2
|
||||||
ifup eth0
|
ifup eth0
|
||||||
|
if [ -e /etc/auto_resize_vda.sh ]; then
|
||||||
|
echo Auto-resizing file-system
|
||||||
|
/etc/auto_resize_vda.sh
|
||||||
|
fi
|
||||||
echo Preprovision done at $(date)
|
echo Preprovision done at $(date)
|
||||||
`
|
`
|
||||||
|
|
||||||
@ -69,7 +74,7 @@ func preProvisionUbuntu(d *schema.ResourceData) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
log.Print("[DEBUG] running provisionPayload")
|
log.Print("[DEBUG] running provisionPayload")
|
||||||
err = runCommand(comm, "sudo bash /tmp/tf_preprovision.sh >> /tmp/tf_preprovision.log 2>&1")
|
err = runCommand(comm, "sudo bash /tmp/tf_preprovision.sh \"$SSH_CLIENT\" >> /tmp/tf_preprovision.log 2>&1")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user