opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 01:27:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman machine init --ignition-path

Browse Source 
allow for the user to provide an alternate ignition-file rather than the
auto-generated one.

updated docs to describe ramifications of providing an alterate ignition
file.

[NO TESTS NEEDED]

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2021-03-30 09:41:58 -05:00
parent 5e28b35aa5
commit b898b19e45
2 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/source/markdown/podman-machine-init.1.md
View File

@ -28,7 +28,12 @@ Size of the disk for the guest VM in GB.
#### **\-\-ignition-path** #### **\-\-ignition-path**
Fully qualified path of the ignition file Fully qualified path of the ignition file.
If an ignition file is provided, the file
will be copied into the user's CONF_DIR and renamed. Additionally, no SSH keys will
be generated nor will a system connection be made. It is assumed that the user will
do these things manually or handle otherwise.
#### **\-\-image-path** #### **\-\-image-path**

41
pkg/machine/qemu/machine.go
View File

@ -36,12 +36,8 @@ func NewMachine(opts machine.InitOptions) (machine.VM, error) {
if len(opts.Name) > 0 { if len(opts.Name) > 0 {
vm.Name = opts.Name vm.Name = opts.Name
} }
vm.IgnitionFilePath = opts.IgnitionPath ignitionFile := filepath.Join(vmConfigDir, vm.Name+".ign")
// If no ignitionfilepath was provided, use defaults vm.IgnitionFilePath = ignitionFile
if len(vm.IgnitionFilePath) < 1 {
ignitionFile := filepath.Join(vmConfigDir, vm.Name+".ign")
vm.IgnitionFilePath = ignitionFile
}
// An image was specified // An image was specified
if len(opts.ImagePath) > 0 { if len(opts.ImagePath) > 0 {
@ -124,6 +120,9 @@ func LoadVMByName(name string) (machine.VM, error) {
// Init writes the json configuration file to the filesystem for // Init writes the json configuration file to the filesystem for
// other verbs (start, stop) // other verbs (start, stop)
func (v *MachineVM) Init(opts machine.InitOptions) error { func (v *MachineVM) Init(opts machine.InitOptions) error {
var (
key string
)
sshDir := filepath.Join(homedir.Get(), ".ssh") sshDir := filepath.Join(homedir.Get(), ".ssh")
// GetConfDir creates the directory so no need to check for // GetConfDir creates the directory so no need to check for
// its existence // its existence
@ -163,9 +162,13 @@ func (v *MachineVM) Init(opts machine.InitOptions) error {
// Add location of bootable image // Add location of bootable image
v.CmdLine = append(v.CmdLine, "-drive", "if=virtio,file="+v.ImagePath) v.CmdLine = append(v.CmdLine, "-drive", "if=virtio,file="+v.ImagePath)
// This kind of stinks but no other way around this r/n // This kind of stinks but no other way around this r/n
uri := machine.SSHRemoteConnection.MakeSSHURL("localhost", "/run/user/1000/podman/podman.sock", strconv.Itoa(v.Port), v.RemoteUsername) if len(opts.IgnitionPath) < 1 {
if err := machine.AddConnection(&uri, v.Name, filepath.Join(sshDir, v.Name), opts.IsDefault); err != nil { uri := machine.SSHRemoteConnection.MakeSSHURL("localhost", "/run/user/1000/podman/podman.sock", strconv.Itoa(v.Port), v.RemoteUsername)
return err if err := machine.AddConnection(&uri, v.Name, filepath.Join(sshDir, v.Name), opts.IsDefault); err != nil {
return err
}
} else {
fmt.Println("An ignition path was provided. No SSH connection was added to Podman")
} }
// Write the JSON file // Write the JSON file
b, err := json.MarshalIndent(v, "", " ") b, err := json.MarshalIndent(v, "", " ")
@ -175,9 +178,14 @@ func (v *MachineVM) Init(opts machine.InitOptions) error {
if err := ioutil.WriteFile(jsonFile, b, 0644); err != nil { if err := ioutil.WriteFile(jsonFile, b, 0644); err != nil {
return err return err
} }
key, err := machine.CreateSSHKeys(v.IdentityPath)
if err != nil { // User has provided ignition file so keygen
return err // will be skipped.
if len(opts.IgnitionPath) < 1 {
key, err = machine.CreateSSHKeys(v.IdentityPath)
if err != nil {
return err
}
} }
// Run arch specific things that need to be done // Run arch specific things that need to be done
if err := v.prepare(); err != nil { if err := v.prepare(); err != nil {
@ -199,6 +207,15 @@ func (v *MachineVM) Init(opts machine.InitOptions) error {
return errors.Errorf("error resizing image: %q", err) return errors.Errorf("error resizing image: %q", err)
} }
} }
// If the user provides an ignition file, we need to
// copy it into the conf dir
if len(opts.IgnitionPath) > 0 {
inputIgnition, err := ioutil.ReadFile(opts.IgnitionPath)
if err != nil {
return err
}
return ioutil.WriteFile(v.IgnitionFilePath, inputIgnition, 0644)
}
// Write the ignition file // Write the ignition file
ign := machine.DynamicIgnition{ ign := machine.DynamicIgnition{
Name: opts.Username, Name: opts.Username,