diff --git a/internal/core/machine.go b/internal/core/machine.go index a00eac47e..b00bc0331 100644 --- a/internal/core/machine.go +++ b/internal/core/machine.go @@ -173,12 +173,6 @@ func (m *Machine) Inspect() (printable string, err error) { return } -// Reload implements core.Machine -func (m *Machine) Reload() (err error) { - // TODO - return -} - // ConnectionInfo implements core.Machine func (m *Machine) ConnectionInfo() (info *core.ConnectionInfo, err error) { // TODO: need Vagrantfile diff --git a/lib/vagrant/machine/remote.rb b/lib/vagrant/machine/remote.rb index 041b4ecb2..6c4382562 100644 --- a/lib/vagrant/machine/remote.rb +++ b/lib/vagrant/machine/remote.rb @@ -135,6 +135,10 @@ module Vagrant nil end + def reload + id + end + def state client.machine_state end diff --git a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb index 854de970b..634f7fc5b 100644 --- a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb @@ -447,7 +447,6 @@ module Hashicorp rpc :GetState, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Target::Machine::State rpc :Box, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Box rpc :Guest, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Args::Guest - rpc :Reload, ::Google::Protobuf::Empty, ::Google::Protobuf::Empty rpc :ConnectionInfo, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Target::Machine::ConnectionInfoResponse rpc :UID, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Target::Machine::UIDResponse rpc :SyncedFolders, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::Target::Machine::SyncedFoldersResponse diff --git a/plugins/commands/serve/client/target/machine.rb b/plugins/commands/serve/client/target/machine.rb index bef9c90e4..3551835f9 100644 --- a/plugins/commands/serve/client/target/machine.rb +++ b/plugins/commands/serve/client/target/machine.rb @@ -70,11 +70,6 @@ module VagrantPlugins p.name end - # Force a reload of the machine state - def reload - client.reload(Empty.new) - end - # Set ID for machine # # @param [String] new_id New machine ID