Merge pull request #647 from stephenfin/feat/cleanup

Cleanup some files

lib/vagrant-libvirt/action/create_domain.rb

@@ -12,7 +12,7 @@ def initialize(app, _env)
         end
 
         def _disk_name(name, disk)
-          "#{name}-#{disk[:device]}.#{disk[:type]}"	# disk name
+          "#{name}-#{disk[:device]}.#{disk[:type]}"  # disk name
         end
 
         def _disks_print(disks)

lib/vagrant-libvirt/action/create_network_interfaces.rb

@@ -17,8 +17,8 @@ class CreateNetworkInterfaces
         def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::create_network_interfaces')
           @management_network_name = env[:machine].provider_config.management_network_name
-	        config = env[:machine].provider_config
-	        @nic_model_type = config.nic_model_type
+          config = env[:machine].provider_config
+          @nic_model_type = config.nic_model_type
           @nic_adapter_count = config.nic_adapter_count
           @app = app
         end
@@ -69,7 +69,7 @@ def call(env)
             @network_name = iface_configuration[:network_name]
             @mac = iface_configuration.fetch(:mac, false)
             @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
-	    @device_name = iface_configuration.fetch(:iface_name, false)
+            @device_name = iface_configuration.fetch(:iface_name, false)
             template_name = 'interface'
             # Configuration for public interfaces which use the macvtap driver
             if iface_configuration[:iface_type] == :public_network

lib/vagrant-libvirt/action/forward_ports.rb

@@ -111,7 +111,7 @@ def redirect_port(machine, host_ip, host_port, guest_ip, guest_port,
               @env[:ui].info 'Requesting sudo for host port(s) <= 1024'
               r = system('sudo -v')
               if r
-                ssh_cmd << 'sudo '	# add sudo prefix
+                ssh_cmd << 'sudo '  # add sudo prefix
               end
             end
           end
@@ -175,7 +175,7 @@ def call(env)
               kill_cmd = ''
 
               if tag[:port] <= 1024
-                kill_cmd << 'sudo '	# add sudo prefix
+                kill_cmd << 'sudo '  # add sudo prefix
               end
 
               kill_cmd << "kill #{tag[:pid]}"

lib/vagrant-libvirt/action/prepare_nfs_settings.rb

@@ -39,7 +39,7 @@ def using_nfs?
         #
         # @param [Machine] machine
         # @return [String]
-	def read_host_ip(ip)
+        def read_host_ip(ip)
           UDPSocket.open do |s|
             if(ip.kind_of?(Array))
               s.connect(ip.last, 1)

lib/vagrant-libvirt/config.rb

@@ -173,10 +173,10 @@ def initialize
         @nic_adapter_count = UNSET_VALUE
 
         # Boot order
-        @boot_order = []
+        @boot_order        = []
         # Storage
         @disks             = []
-        @cdroms			   = []
+        @cdroms            = []
 
         # Inputs
         @inputs            = UNSET_VALUE
@@ -198,15 +198,15 @@ def initialize
       end
 
       def boot(device)
-        @boot_order << device	# append
+        @boot_order << device  # append
       end
 
       def _get_device(disks)
         # skip existing devices and also the first one (vda)
         exist = disks.collect {|x| x[:device]}+[1.vdev.to_s]
-        skip = 1		# we're 1 based, not 0 based...
+        skip = 1  # we're 1 based, not 0 based...
         while true do
-          dev = skip.vdev	# get lettered device
+          dev = skip.vdev  # get lettered device
           if !exist.include?(dev)
             return dev
           end
@@ -363,7 +363,7 @@ def _handle_disk_storage(options={})
         options = {
           :device => _get_device(@disks),
           :type => 'qcow2',
-          :size => '10G',	# matches the fog default
+          :size => '10G',  # matches the fog default
           :path => nil,
           :bus => 'virtio'
         }.merge(options)
@@ -378,7 +378,7 @@ def _handle_disk_storage(options={})
           :allow_existing => options[:allow_existing],
         }
 
-        @disks << disk	# append
+        @disks << disk  # append
       end
 
       # code to generate URI from a config moved out of the connect action
@@ -397,7 +397,7 @@ def _generate_uri
           raise "Require specify driver #{uri}"
         end
         if uri == 'kvm'
-          uri = 'qemu'	# use qemu uri for kvm domain type
+          uri = 'qemu'  # use qemu uri for kvm domain type
         end
 
         if @connect_via_ssh

lib/vagrant-libvirt/templates/interface.xml.erb

@@ -1,13 +1,13 @@
 <interface type='network'>
   <source network='<%= @network_name %>'/>
-	<% if @mac %>
-  	<mac address='<%= @mac %>'/>
-	<% end %>
-	<% if @device_name %>
-	<target dev='<%= @device_name %>'/>
-	<% else %>
-	<target dev='vnet<%= @iface_number %>'/>
-	<% end %>
+    <% if @mac %>
+      <mac address='<%= @mac %>'/>
+    <% end %>
+    <% if @device_name %>
+      <target dev='<%= @device_name %>'/>
+    <% else %>
+      <target dev='vnet<%= @iface_number %>'/>
+    <% end %>
   <alias name='net<%= @iface_number %>'/>
   <model type='<%=@model_type%>'/>
 </interface>

tools/prepare_redhat_for_box.sh

@@ -12,39 +12,39 @@
 
 # We need to set a hostname.
 if [ $# -ne 1 ]; then
-	echo "Usage: $0 <hostname>"
-	echo "Hostname should be in format vagrant-[os-name], e.g. vagrant-redhat63."
-	exit 1
+    echo "Usage: $0 <hostname>"
+    echo "Hostname should be in format vagrant-[os-name], e.g. vagrant-redhat63."
+    exit 1
 fi
 
 
 # On which version of RedHet are we running?
 RHEL_MAJOR_VERSION=$(sed 's/.*release \([0-9]\)\..*/\1/' /etc/redhat-release)
 if [ $? -ne 0 ]; then
-	echo "Is this a RedHat distro?"
-	exit 1
+    echo "Is this a RedHat distro?"
+    exit 1
 fi
 echo "* Found RedHat ${RHEL_MAJOR_VERSION} version."
 
 
 # Setup hostname vagrant-something.
 FQDN="$1.vagrantup.com"
 if grep '^HOSTNAME=' /etc/sysconfig/network > /dev/null; then
-	sed -i 's/HOSTNAME=\(.*\)/HOSTNAME='${FQDN}'/' /etc/sysconfig/network
+    sed -i 's/HOSTNAME=\(.*\)/HOSTNAME='${FQDN}'/' /etc/sysconfig/network
 else
-	echo "HOSTNAME=${FQDN}" >> /etc/sysconfig/network
+    echo "HOSTNAME=${FQDN}" >> /etc/sysconfig/network
 fi
 
 
 # Enable EPEL repository.
 yum -y install wget
 cd ~root
 if [ $RHEL_MAJOR_VERSION -eq 5 ]; then
-	wget http://ftp.astral.ro/mirrors/fedora/pub/epel/5/i386/epel-release-5-4.noarch.rpm
-	EPEL_PKG="epel-release-5-4.noarch.rpm"
+    wget http://ftp.astral.ro/mirrors/fedora/pub/epel/5/i386/epel-release-5-4.noarch.rpm
+    EPEL_PKG="epel-release-5-4.noarch.rpm"
 else
-	wget http://ftp.astral.ro/mirrors/fedora/pub/epel/6/i386/epel-release-6-8.noarch.rpm
-	EPEL_PKG="epel-release-6-8.noarch.rpm"
+    wget http://ftp.astral.ro/mirrors/fedora/pub/epel/6/i386/epel-release-6-8.noarch.rpm
+    EPEL_PKG="epel-release-6-8.noarch.rpm"
 fi
 rpm -i ~root/${EPEL_PKG}
 rm -f ~root/${EPEL_PKG}
@@ -60,9 +60,9 @@ chkconfig sshd on
 echo 'vagrant' | passwd --stdin root
 grep 'vagrant' /etc/passwd > /dev/null
 if [ $? -ne 0 ]; then
-	echo '* Creating user vagrant.'
-	useradd vagrant
-	echo 'vagrant' | passwd --stdin vagrant
+    echo '* Creating user vagrant.'
+    useradd vagrant
+    echo 'vagrant' | passwd --stdin vagrant
 fi
 grep '^admin:' /etc/group > /dev/null || groupadd admin
 usermod -G admin vagrant