From 3e5b0bcdc25ea1cee12d475fbdf1f7b1e8c48016 Mon Sep 17 00:00:00 2001
From: dmaiocchi <dmaiocchi@suse.com>
Date: Tue, 30 Jun 2020 17:05:33 +0200
Subject: [PATCH] Remove vagrant and rpm deprecated info

---
 README.asciidoc                          |  96 +-------
 Vagrantfile                              | 102 --------
 rpm/filter-requires.sh                   |  11 -
 rpm/hawk-rpmlintrc                       |  12 -
 rpm/hawk.spec                            | 291 -----------------------
 rpm/sysconfig.hawk                       |  58 -----
 salt/etc/minion                          |   7 -
 salt/salt/common/cluster.sls             |   2 -
 salt/salt/common/drbd.sls                |  21 --
 salt/salt/common/hosts.sls               |  11 -
 salt/salt/common/init.sls                |   7 -
 salt/salt/common/services.sls            |  15 --
 salt/salt/common/ssh.sls                 |  43 ----
 salt/salt/common/watchdog.sls            |   4 -
 salt/salt/files/crm-initial.conf         |  15 --
 salt/salt/files/global_common.conf       |  26 --
 salt/salt/files/haproxy.cfg              |  16 --
 salt/salt/files/hawk-development.service |  26 --
 salt/salt/files/index.html               |  11 -
 salt/salt/files/r0.res                   |  23 --
 salt/salt/hawkdev/init.sls               |  57 -----
 salt/salt/joins/init.sls                 |   4 -
 salt/salt/sshkeys/ayoub.pub              |   1 -
 salt/salt/sshkeys/krig.pub               |   1 -
 salt/salt/sshkeys/vagrant                |  27 ---
 salt/salt/sshkeys/vagrant.pub            |   1 -
 salt/salt/top.sls                        |   8 -
 salt/salt/utils/configure_drbd.sh        |   9 -
 salt/salt/utils/init_cluster.sh          |  18 --
 salt/salt/utils/install_tools.sh         |   5 -
 salt/salt/utils/join_cluster.sh          |  14 --
 salt/salt/utils/modify_shebangs.sh       |   4 -
 32 files changed, 1 insertion(+), 945 deletions(-)
 delete mode 100644 Vagrantfile
 delete mode 100644 rpm/filter-requires.sh
 delete mode 100644 rpm/hawk-rpmlintrc
 delete mode 100644 rpm/hawk.spec
 delete mode 100644 rpm/sysconfig.hawk
 delete mode 100644 salt/etc/minion
 delete mode 100644 salt/salt/common/cluster.sls
 delete mode 100644 salt/salt/common/drbd.sls
 delete mode 100644 salt/salt/common/hosts.sls
 delete mode 100644 salt/salt/common/init.sls
 delete mode 100644 salt/salt/common/services.sls
 delete mode 100644 salt/salt/common/ssh.sls
 delete mode 100644 salt/salt/common/watchdog.sls
 delete mode 100644 salt/salt/files/crm-initial.conf
 delete mode 100644 salt/salt/files/global_common.conf
 delete mode 100644 salt/salt/files/haproxy.cfg
 delete mode 100644 salt/salt/files/hawk-development.service
 delete mode 100644 salt/salt/files/index.html
 delete mode 100644 salt/salt/files/r0.res
 delete mode 100644 salt/salt/hawkdev/init.sls
 delete mode 100644 salt/salt/joins/init.sls
 delete mode 100644 salt/salt/sshkeys/ayoub.pub
 delete mode 100644 salt/salt/sshkeys/krig.pub
 delete mode 100644 salt/salt/sshkeys/vagrant
 delete mode 100644 salt/salt/sshkeys/vagrant.pub
 delete mode 100644 salt/salt/top.sls
 delete mode 100755 salt/salt/utils/configure_drbd.sh
 delete mode 100755 salt/salt/utils/init_cluster.sh
 delete mode 100755 salt/salt/utils/install_tools.sh
 delete mode 100755 salt/salt/utils/join_cluster.sh
 delete mode 100755 salt/salt/utils/modify_shebangs.sh

diff --git a/README.asciidoc b/README.asciidoc
index eead92183..ca0f524a7 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -290,102 +290,8 @@ your certificate.
 
 
 == Hacking Hawk ==
-=== Preconfigured Vagrant environment
 
-To hack on Hawk we recommend to use the vagrant setup. There is a
-Vagrantfile attached, which creates a three-node cluster with a basic
-configuration suitable for development and testing.
-
-To be prepared for getting our vagrant setup running you need to follow
-some steps.
-
-* Install the vagrant package from http://www.vagrantup.com/downloads.html,
-  the minimal version requirement is +>= 1.7.0+ in order to work properly
-  with openSUSE/SLED workstation setups.
-* Install +virtualbox+, we assume you know how to do that on your OS. If
-  you prefer +libvirt+ you can use that as well.
-
-Out of the box, +vagrant+ is configured to synchronize the working
-folder to +/vagrant+ in the virtual machines using NFS. For this to
-work properly, the +vagrant-bindfs+ plugin is necessary.
-
-Install it using the following command:
-
-----------
-# vagrant plugin install vagrant-bindfs
-----------
-
-
-* If you plan to use +libvirt+ as provider make sure you have the libvirt-plugin installed:
-
-----------
-# vagrant plugin install vagrant-libvirt
-----------
-
-* You need to fetch the git submodules to finish your development setup:
-
-----------
-# git submodule update --init --recursive
-----------
-
-This is all you need to prepare initially to set up the vagrant environment,
-now you can simply start the virtual machine with +vagrant up+ and start
-an ssh session with +vagrant ssh webui+ based on +virtualbox+. To start the
-virtual machines on +libvirt+ you have to append +--provider=libvirt+ to the
-above commands, e.g. +vagrant up --provider=libvirt+. If you want to access
-the source within the virtual machine you have to switch to the +/vagrant+
-directory.
-
-=== Web server instances
-You can access the Hawk web interface based on the git source through
-+http://localhost:3000+ now. If you want to access the version installed
-through packages you can reach it through +https://localhost:7630+.
-
-In fact, within the Vagrant environment, there are two instances of the Puma web
-server running. The first one is accessible through +https://localhost:7630+, with
-+/srv/www/hawk+ as the root directory. This instance is launched by default as a
-production server when installing hawk through the package manager or when
-launching the vagrant environment. It is used to monitor and manage the cluster
-in the real production environment. Note also that this puma server instance is
-running automatically at startup through a systemd script.
-
-The commands used to control this server are:
-
-----------
-$ vagrant ssh webui
-vagrant@webui:~> sudo systemctl start hawk
-vagrant@webui:~> sudo systemctl stop hawk
-vagrant@webui:~> sudo systemctl restart hawk
-vagrant@webui:~> sudo systemctl status hawk
-----------
-
-The other instance is used for development purposes. Its root directory is
-+/vagrant/hawk/hawk+. That's because the /vagrant folder is synced with the host
-machine's working folder (the local git repository), so any changes in that folder
-is detected instantly by this server instance in the guest machine.
-This instance is accessible through +http://localhost:3000+.
-Also, You can find installed on the development VM a script called +hawk+
-(hawk/bin/hawk), which can be used to control the development instance of hawk:
-
-----------
-$ vagrant ssh webui
-vagrant@webui:~> hawk status
-vagrant@webui:~> hawk log
-vagrant@webui:~> hawk start
-vagrant@webui:~> hawk stop
-vagrant@webui:~> hawk restart
-vagrant@webui:~> hawk server
-----------
-
-Because Hawk is multi-threaded, the Rails asset auto-loading doesn't work properly.
-Unfortunately this means that you need to run +hawk restart+ after changing
-most files. The exception is the HAML view files which update automatically.
-
-If the development hawk instance isn't running, it can be started using this command:
-
-----------
-webui:/vagrant/hawk # sudo -u vagrant bin/rails s
-----------
+Use https://github.com/SUSE/pacemaker-deploy for deploying hawk
 
 === Puma server configuration
 
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index 7cc9187d0..000000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-def host_bind_address
-  ENV['VAGRANT_INSECURE_FORWARDS'] =~ /^(y(es)?|true|on)$/i ? '*' : '127.0.0.1'
-end
-
-$shared_disk = '_shared_disk'
-$shared_disk_size = 128 # MB
-
-$drbd_disk = '_drbd_disk'
-$drbd_disk_size = 256 # MB
-
-# Create and attach shared SBD/OCFS2 disk for VirtualBox
-class VagrantPlugins::ProviderVirtualBox::Action::SetName
-  alias_method :original_call, :call
-  def call(env)
-    disk_file = "#{$shared_disk}.vdi"
-    ui = env[:ui]
-    driver = env[:machine].provider.driver
-    uuid = driver.instance_eval { @uuid }
-    if !File.exist?(disk_file)
-      ui.info "Creating storage file '#{disk_file}'..."
-      driver.execute('createhd', "--filename", disk_file, "--size", "#{$shared_disk_size}", '--variant', 'fixed')
-      driver.execute('modifyhd', disk_file, '--type', 'shareable')
-    end
-    ui.info "Attaching '#{disk_file}'..."
-    driver.execute('storageattach', uuid, '--storagectl', "SATA Controller", '--port', "1", '--device', "0", '--type', 'hdd', '--medium', disk_file)
-
-    name = env[:machine].provider_config.name
-    disk_file = "#{$drbd_disk}_#{name}.vdi"
-    if !File.exist?(disk_file)
-      ui.info "Creating storage file '#{disk_file}'..."
-      driver.execute('createhd', "--filename", disk_file, "--size", "#{$drbd_disk_size}", '--variant', 'fixed')
-    end
-    ui.info "Attaching '#{disk_file}'..."
-    driver.execute('storageattach', uuid, '--storagectl', "SATA Controller", '--port', "2", '--device', "0", '--type', 'hdd', '--medium', disk_file)
-
-    original_call(env)
-  end
-end
-
-# Shared configuration for all VMs
-def configure_machine(machine, idx, roles, memory)
-  machine.vm.network :forwarded_port, host_ip: host_bind_address, guest: 22, host: 3022 + (idx * 100)
-  machine.vm.network :forwarded_port, host_ip: host_bind_address, guest: 7630, host: 7630 + idx
-  machine.vm.network :private_network, ip: "10.13.37.#{10 + idx}"
-  #machine.vm.network "public_network", use_dhcp_assigned_default_route: true
-
-  machine.vm.provision :salt do |salt|
-    salt.minion_config = "salt/etc/minion"
-    salt.run_highstate = true
-    salt.verbose = true
-    salt.no_minion = true
-  end
-
-  machine.vm.provider :virtualbox do |provider, override|
-    provider.memory = memory
-    provider.cpus = 1
-    provider.name = "hawk-#{machine.vm.hostname}"
-  end
-
-  machine.vm.provider :libvirt do |provider, override|
-    provider.memory = memory
-    provider.cpus = 1
-    provider.graphics_port = 9200 + idx
-    provider.storage :file, path: "#{$shared_disk}.raw", size: "#{$shared_disk_size}M", type: 'raw', cache: 'none', allow_existing: true, shareable: true
-    provider.storage :file, path: "#{$drbd_disk}-#{machine.vm.hostname}.raw", size: "#{$drbd_disk_size}M", type: 'raw', allow_existing: true
-  end
-end
-
-Vagrant.configure("2") do |config|
-  unless Vagrant.has_plugin?("vagrant-bindfs")
-    abort 'Missing bindfs plugin! Please install using vagrant plugin install vagrant-bindfs'
-  end
-
-  config.vm.box = "hawk/leap-42.3-ha"
-  config.vm.box_check_update = true
-  config.ssh.insert_key = false
-  config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ["rw", "noatime", "async"]
-  config.bindfs.bind_folder "/vagrant", "/vagrant", force_user: "hacluster", force_group: "haclient", perms: "u=rwX:g=rwXD:o=rXD", after: :provision
-
-  config.vm.define "webui", primary: true do |machine|
-    machine.vm.hostname = "webui"
-    machine.vm.network :forwarded_port, host_ip: host_bind_address, guest: 3000, host: 3000
-    machine.vm.network :forwarded_port, host_ip: host_bind_address, guest: 8808, host: 8808
-    configure_machine machine, 0, ["base", "webui"], 1536
-  end
-
-  1.upto(2).each do |i|
-    config.vm.define "node#{i}", autostart: true do |machine|
-      machine.vm.hostname = "node#{i}"
-      configure_machine machine, i, ["base", "node"], 1536
-    end
-  end
-
-  config.vm.provider :libvirt do |provider, override|
-    provider.cpu_mode = 'host-passthrough'
-    provider.storage_pool_name = "default"
-    provider.management_network_name = "vagrant"
-  end
-end
diff --git a/rpm/filter-requires.sh b/rpm/filter-requires.sh
deleted file mode 100644
index 0d162274d..000000000
--- a/rpm/filter-requires.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Courtesy of http://fedoraproject.org/wiki/PackagingDrafts/FilteringAutomaticDependencies
-
-if [ -x /usr/lib/rpm/redhat/find-requires ] ; then
-	FINDREQ=/usr/lib/rpm/redhat/find-requires
-else
-	FINDREQ=/usr/lib/rpm/find-requires
-fi
-
-$FINDREQ $* | sed -e '/libfcgi.so/d'
-
diff --git a/rpm/hawk-rpmlintrc b/rpm/hawk-rpmlintrc
deleted file mode 100644
index 73c140fe3..000000000
--- a/rpm/hawk-rpmlintrc
+++ /dev/null
@@ -1,12 +0,0 @@
-addFilter("non-executable-script .*/srv/www/hawk/vendor/*")
-addFilter("script-without-shebang .*/srv/www/hawk/vendor/*")
-addFilter("wrong-script-end-of-line-encoding .*/srv/www/hawk/vendor/*")
-addFilter("file-not-in-%lang .*/srv/www/hawk/vendor/*")
-addFilter("hidden-file-or-dir .*/srv/www/hawk/vendor/*")
-addFilter("zero-length .*/srv/www/hawk/vendor/*")
-addFilter("unexpanded-macro .*/srv/www/hawk/vendor/bundle")
-
-addFilter("hidden-file-or-dir /srv/www/hawk/.bundle")
-
-addFilter("dangling-symlink /srv/www/hawk/public/doc/")
-
diff --git a/rpm/hawk.spec b/rpm/hawk.spec
deleted file mode 100644
index bf7373fca..000000000
--- a/rpm/hawk.spec
+++ /dev/null
@@ -1,291 +0,0 @@
-#
-# spec file for package hawk
-#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-%if 0%{?suse_version}
-%define	www_base	/srv/www
-%define	vendor_ruby	vendor_ruby
-%define	init_style	suse
-%define	pkg_group	Productivity/Clustering/HA
-%else
-%define	www_base	/var/www
-%define	vendor_ruby	site_ruby
-%define	init_style	redhat
-%define	pkg_group	System Environment/Daemons
-%endif
-
-%define	gname		haclient
-%define	uname		hacluster
-
-Name:           hawk
-Summary:        HA Web Konsole
-License:        GPL-2.0
-Group:          %{pkg_group}
-Version:        2.0.0
-Release:        0
-Url:            http://www.clusterlabs.org/wiki/Hawk
-Source:         %{name}-%{version}.tar.bz2
-Source100:      hawk-rpmlintrc
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Provides:       ha-cluster-webui
-Requires:       crmsh
-Requires:       graphviz
-Requires:       graphviz-gd
-# Need a font of some kind for graphviz to work correctly (bsc#931950)
-Requires:       dejavu
-Requires:       pacemaker >= 1.1.8
-%if 0%{?fedora_version} >= 19
-Requires:       rubypick
-BuildRequires:  rubypick
-%endif
-Requires:       rubygem(%{rb_default_ruby_abi}:bundler)
-%if 0%{?suse_version}
-Recommends:     graphviz-gnome
-Requires:       iproute2
-PreReq:         permissions
-BuildRequires:  fdupes
-BuildRequires:  libpacemaker-devel
-%{?systemd_requires}
-%if 0%{?suse_version} >= 1210
-BuildRequires:  systemd
-%endif
-%else
-Requires:       iproute
-BuildRequires:  pacemaker-libs-devel
-%endif
-
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:builder) >= 3.2
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:byebug) >= 3.5
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9.2
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:gettext:3) >= 3.1
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1) >= 1.2
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js) >= 1.0
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:haml-rails) >= 0.8.2
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:hashie) >= 3.4
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:js-routes:1)
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:kramdown:1) >= 1.3
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:mail) >= 2.6
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:mime-types) < 3
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:mime-types) >= 2.5
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:minitest) >= 5.6
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:puma:2) >= 2.11
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:rails:4.2)
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:ruby_parser) >= 3.6.6
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:sass) >= 3.4
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:sass-rails) >= 5.0.1
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:sexp_processor) >= 4.5.1
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:spring) >= 1.3
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:virtus)
-
-%if 0%{?suse_version} <= 1310
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:rake:10.4)
-%endif
-
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:sprockets) >= 3.0
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:thor) >= 0.19
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:tilt:1.4)
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:uglifier)
-BuildRequires:  rubygem(%{rb_default_ruby_abi}:web-console:2) >= 2.1
-
-%if 0%{?bundle_gems}
-%else
-# SLES bundles all this stuff at build time, other distros just
-# use runtime dependencies.
-Requires:       rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9.2
-Requires:       rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1) >= 1.2
-Requires:       rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js) >= 1.0
-Requires:       rubygem(%{rb_default_ruby_abi}:haml-rails) >= 0.8.2
-Requires:       rubygem(%{rb_default_ruby_abi}:hashie) >= 3.4
-Requires:       rubygem(%{rb_default_ruby_abi}:js-routes:1)
-Requires:       rubygem(%{rb_default_ruby_abi}:kramdown:1) >= 1.3
-Requires:       rubygem(%{rb_default_ruby_abi}:puma:2) >= 2.11
-Requires:       rubygem(%{rb_default_ruby_abi}:rails:4.2)
-Requires:       rubygem(%{rb_default_ruby_abi}:sass-rails:5.0) >= 5.0.1
-Requires:       rubygem(%{rb_default_ruby_abi}:sass:3.4)
-Requires:       rubygem(%{rb_default_ruby_abi}:sexp_processor) >= 4.5.1
-Requires:       rubygem(%{rb_default_ruby_abi}:sprockets) >= 3.0
-Requires:       rubygem(%{rb_default_ruby_abi}:tilt:1.4)
-Requires:       rubygem(%{rb_default_ruby_abi}:virtus:1.0)
-
-%if 0%{?suse_version} <= 1310
-Requires:       rubygem(%{rb_default_ruby_abi}:rake:10.4)
-%endif
-
-%endif
-
-BuildRequires:  %{rubydevel >= 1.8.7}
-BuildRequires:  git
-BuildRequires:  glib2-devel
-BuildRequires:  libxml2-devel >= 2.6.21
-BuildRequires:  libxslt-devel
-BuildRequires:  openssl-devel
-BuildRequires:  pam-devel
-
-%description
-A web-based GUI for managing and monitoring the Pacemaker
-High-Availability cluster resource manager.
-
-
-%prep
-%setup
-
-%build
-export NOKOGIRI_USE_SYSTEM_LIBRARIES=1
-CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
-export CFLAGS
-make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} LIBDIR=%{_libdir} BINDIR=%{_bindir} SBINDIR=%{_sbindir} BUNDLE_GEMS=%{expand:%{?bundle_gems:true}%{!?bundle_gems:false}} RUBY_ABI=%{rb_ver}
-
-%install
-make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} DESTDIR=%{buildroot} BUNDLE_GEMS=%{expand:%{?bundle_gems:true}%{!?bundle_gems:false}} install
-# copy of GPL
-cp COPYING %{buildroot}%{www_base}/hawk/
-%if 0%{?bundle_gems}
-# get rid of gem sample and test cruft
-rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/doc
-rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/examples
-rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/samples
-rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/test
-rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/ports
-rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/ext
-%endif
-%if 0%{?suse_version}
-
-# Hack so missing links to docs don't kill the build
-mkdir -p %{buildroot}/usr/share/doc/manual/sle-ha-geo-quick_en-pdf
-mkdir -p %{buildroot}/usr/share/doc/manual/sle-ha-guide_en-pdf
-mkdir -p %{buildroot}/usr/share/doc/manual/sle-ha-manuals_en
-mkdir -p %{buildroot}/usr/share/doc/manual/sle-ha-geo-manuals_en
-mkdir -p %{buildroot}/usr/share/doc/manual/sle-ha-nfs-quick_en-pdf
-mkdir -p %{buildroot}/usr/share/doc/manual/sle-ha-install-quick_en
-
-# mark .mo files as such (works on SUSE but not FC12, as the latter wants directory to
-# be "share/locale", not just "locale", and it also doesn't support appending to %%{name}.lang)
-%find_lang hawk hawk.lang
-# don't ship .po files (find_lang only grabs the mos, and we don't need the pos anyway)
-rm %{buildroot}%{www_base}/hawk/locale/*/hawk.po
-rm %{buildroot}%{www_base}/hawk/locale/*/hawk.po.time_stamp
-rm %{buildroot}%{www_base}/hawk/locale/*/hawk.edit.po
-# hard link duplicate files
-%fdupes %{buildroot}
-%else
-# Need file to exist else %%files fails later
-touch hawk.lang
-%endif
-# more cruft to clean up (WTF?)
-rm -f %{buildroot}%{www_base}/hawk/log/*
-# likewise .git special files
-find %{buildroot}%{www_base}/hawk -type f -name '.git*' -print0 | xargs --no-run-if-empty -0 rm
-%if 0%{?suse_version}
-%{__ln_s} -f %{_sbindir}/service %{buildroot}%{_sbindir}/rchawk
-%endif
-
-install -p -d -m 755 %{buildroot}%{_sysconfdir}/hawk
-
-%clean
-rm -rf %{buildroot}
-
-%if 0%{?suse_version}
-# TODO(must): Determine sensible non-SUSE versions of these,
-# in particular restart_on_update and stop_on_removal.
-
-%verifyscript
-%verify_permissions -e %{_sbindir}/hawk_chkpwd
-%verify_permissions -e %{_sbindir}/hawk_invoke
-
-%pre
-%service_add_pre hawk.service
-
-%post
-%set_permissions %{_sbindir}/hawk_chkpwd
-%set_permissions %{_sbindir}/hawk_invoke
-%service_add_post hawk.service
-
-%preun
-%service_del_preun hawk.service
-
-%postun
-%service_del_postun hawk.service
-
-%endif
-
-%files -f hawk.lang
-%defattr(644,root,root,755)
-%attr(4750, root, %{gname})%{_sbindir}/hawk_chkpwd
-%attr(4750, root, %{gname})%{_sbindir}/hawk_invoke
-%attr(0755, root, root) %{_sbindir}/hawk_monitor
-%dir %{www_base}/hawk
-%{www_base}/hawk/app
-%{www_base}/hawk/config
-%{www_base}/hawk/lib
-%dir %{www_base}/hawk/bin
-%attr(0755, root, root)%{www_base}/hawk/bin/rake
-%attr(0755, root, root)%{www_base}/hawk/bin/rails
-%exclude %{www_base}/hawk/bin/hawk
-%attr(0755, root, root)%{www_base}/hawk/bin/generate-ssl-cert
-%attr(0755, root, root)%{www_base}/hawk/bin/bundle
-%attr(0750, %{uname},%{gname})%{_sysconfdir}/hawk
-%attr(0750, %{uname},%{gname})%{www_base}/hawk/log
-%dir %attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp
-%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/cache
-%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/explorer
-%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/home
-%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/pids
-%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/sessions
-%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/sockets
-%exclude %{www_base}/hawk/tmp/session_secret
-%{www_base}/hawk/locale/hawk.pot
-%if 0%{?bundle_gems}
-%{www_base}/hawk/.bundle
-%endif
-%{www_base}/hawk/public
-%{www_base}/hawk/Rakefile
-%if 0%{?bundle_gems}
-%{www_base}/hawk/Gemfile
-%{www_base}/hawk/Gemfile.lock
-%else
-%exclude %{www_base}/hawk/Gemfile
-%exclude %{www_base}/hawk/Gemfile.lock
-%endif
-%{www_base}/hawk/COPYING
-%{www_base}/hawk/config.ru
-%{www_base}/hawk/test
-%if 0%{?suse_version}
-# itemizing content in %%{www_base}/hawk/locale to avoid
-# duplicate files that would otherwise be the result of including hawk.lang
-%dir %{www_base}/hawk/locale
-%dir %{www_base}/hawk/locale/*
-%dir %{www_base}/hawk/locale/*/*
-%else
-%{www_base}/hawk/locale
-%endif
-
-# Not doing this itemization for %%lang files in vendor, it's frightfully
-# hideous, so we're going to live with a handful of file-not-in-%%lang rpmlint
-# warnings for bundled gems.
-%{www_base}/hawk/vendor
-
-%if 0%{?bundle_gems}
-%attr(0755, root, root) %{www_base}/hawk/vendor/bundle/ruby/*/bin/puma
-%attr(0755, root, root) %{www_base}/hawk/vendor/bundle/ruby/*/bin/pumactl
-%endif
-
-%{_unitdir}/hawk.service
-%if 0%{?suse_version}
-%attr(-,root,root) %{_sbindir}/rchawk
-%endif
-
-%changelog
diff --git a/rpm/sysconfig.hawk b/rpm/sysconfig.hawk
deleted file mode 100644
index 2c3c41bbd..000000000
--- a/rpm/sysconfig.hawk
+++ /dev/null
@@ -1,58 +0,0 @@
-## Path:            Cluster/Hawk
-## Description:     Mode of operation
-## Type:            string(production,development,test)
-## Default:         production
-## ServiceRestart:  hawk
-# Hawk can run in production, development or test mode. Normally, this
-# determines which database is used, but it may also have other
-# implications.
-HAWK_ENV="production"
-
-## Path:            Cluster/Hawk
-## Description:     Maximum number of threads
-## Type:            integer
-## Default:         1
-## ServiceRestart:  hawk
-# Sets the maximum number of threads used by the web server.
-HAWK_THREADS="16"
-
-## Path:            Cluster/Hawk
-## Description:     Maximum number of worker processes
-## Type:            integer
-## Default:         2
-## ServiceRestart:  hawk
-# Sets the maximum number of separate worker processes spawned by the
-# web server.
-HAWK_WORKERS="1"
-
-## Path:            Cluster/Hawk
-## Description:     Listen address
-## Type:            ip
-## Default:         0.0.0.0
-## ServiceRestart:  hawk
-# Network address which Hawk listens to for connections.
-HAWK_LISTEN="0.0.0.0"
-
-## Path:            Cluster/Hawk
-## Description:     Port
-## Type:            integer(0:65565)
-## Default:         7630
-## ServiceRestart:  hawk
-# Port which Hawk listens to.
-HAWK_PORT="7630"
-
-## Path:            Cluster/Hawk
-## Description:     SSL key used by the web server
-## Type:            string
-## Default:         /etc/hawk/hawk.key
-## ServiceRestart:  hawk
-# Configures an SSL key that the Hawk web server presents.
-HAWK_KEY="/etc/hawk/hawk.key"
-
-## Path:            Cluster/Hawk
-## Description:     SSL certificate used by the web server
-## Type:            string
-## Default:         /etc/hawk/hawk.pem
-## ServiceRestart:  hawk
-# Configures an SSL certificate that the Hawk web server presents.
-HAWK_CERT="/etc/hawk/hawk.pem"
diff --git a/salt/etc/minion b/salt/etc/minion
deleted file mode 100644
index a22ff8009..000000000
--- a/salt/etc/minion
+++ /dev/null
@@ -1,7 +0,0 @@
-file_client: local
-file_roots:
-  base:
-    - /vagrant/salt/salt
-pillar_roots:
-  base:
-    - /vagrant/salt/pillar
diff --git a/salt/salt/common/cluster.sls b/salt/salt/common/cluster.sls
deleted file mode 100644
index 91ea7e1d1..000000000
--- a/salt/salt/common/cluster.sls
+++ /dev/null
@@ -1,2 +0,0 @@
-salt://utils/modify_shebangs.sh:
-  cmd.script: []
diff --git a/salt/salt/common/drbd.sls b/salt/salt/common/drbd.sls
deleted file mode 100644
index 047ebd53b..000000000
--- a/salt/salt/common/drbd.sls
+++ /dev/null
@@ -1,21 +0,0 @@
-/etc/drbd.d/global_common.conf:
-  file.managed:
-    - source: salt://files/global_common.conf
-    - user: root
-    - group: root
-    - mode: 644
-
-/etc/drbd.d/r0.res:
-  file.managed:
-    - source: salt://files/r0.res
-    - user: root
-    - group: root
-    - mode: 644
-    - template: jinja
-    - context:
-{% if 'vdc' in grains['disks'] %}
-        disk: /dev/vdc
-{% else %}
-        disk: /dev/sdc
-{% endif %}
-
diff --git a/salt/salt/common/hosts.sls b/salt/salt/common/hosts.sls
deleted file mode 100644
index 2bbb7efda..000000000
--- a/salt/salt/common/hosts.sls
+++ /dev/null
@@ -1,11 +0,0 @@
-webui:
-  host.present:
-    - ip: 10.13.37.10
-
-node1:
-  host.present:
-    - ip: 10.13.37.11
-
-node2:
-  host.present:
-    - ip: 10.13.37.12
diff --git a/salt/salt/common/init.sls b/salt/salt/common/init.sls
deleted file mode 100644
index b5caac68e..000000000
--- a/salt/salt/common/init.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-include:
-  - common.watchdog
-  - common.hosts
-  - common.ssh
-  - common.cluster
-  - common.drbd
-  - common.services
diff --git a/salt/salt/common/services.sls b/salt/salt/common/services.sls
deleted file mode 100644
index 05b65ea91..000000000
--- a/salt/salt/common/services.sls
+++ /dev/null
@@ -1,15 +0,0 @@
-/srv/www/htdocs/index.html:
-  file.managed:
-    - source: salt://files/index.html
-    - template: jinja
-    - context:
-        hostname: "{{ grains['id'] }}"
-
-/etc/haproxy/haproxy.cfg:
-  file.managed:
-    - source: salt://files/haproxy.cfg
-
-/etc/apache2/listen.conf:
-  file.replace:
-    - pattern: '^Listen \d+$'
-    - repl: "Listen 8000"
diff --git a/salt/salt/common/ssh.sls b/salt/salt/common/ssh.sls
deleted file mode 100644
index 964c3174e..000000000
--- a/salt/salt/common/ssh.sls
+++ /dev/null
@@ -1,43 +0,0 @@
-vagrant_root:
-  ssh_auth.present:
-    - user: root
-    - source: salt://sshkeys/vagrant.pub
-
-vagrant_vagrant:
-  ssh_auth.present:
-    - user: vagrant
-    - source: salt://sshkeys/vagrant.pub
-
-krig_root:
-  ssh_auth.present:
-    - user: root
-    - source: salt://sshkeys/krig.pub
-
-krig_vagrant:
-  ssh_auth.present:
-    - user: vagrant
-    - source: salt://sshkeys/krig.pub
-
-ayoub_root:
-  ssh_auth.present:
-    - user: root
-    - source: salt://sshkeys/ayoub.pub
-
-ayoub_vagrant:
-  ssh_auth.present:
-    - user: vagrant
-    - source: salt://sshkeys/ayoub.pub
-
-/root/.ssh/id_rsa:
-  file.managed:
-    - source: salt://sshkeys/vagrant
-    - user: root
-    - group: root
-    - mode: 600
-
-/root/.ssh/id_rsa.pub:
-  file.managed:
-    - source: salt://sshkeys/vagrant.pub
-    - user: root
-    - group: root
-    - mode: 644
diff --git a/salt/salt/common/watchdog.sls b/salt/salt/common/watchdog.sls
deleted file mode 100644
index bf5186332..000000000
--- a/salt/salt/common/watchdog.sls
+++ /dev/null
@@ -1,4 +0,0 @@
-setup_watchdog:
-  kmod.present:
-    - name: softdog
-    - persist: True
diff --git a/salt/salt/files/crm-initial.conf b/salt/salt/files/crm-initial.conf
deleted file mode 100644
index cf5dedf41..000000000
--- a/salt/salt/files/crm-initial.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-rsc_template web-server apache port=8000 \
-	op monitor interval=10s
-primitive proxy systemd:haproxy \
-	op monitor interval=10s
-primitive proxy-vip IPaddr2 ip=10.13.37.20
-primitive server-instance @web-server
-clone cl-servers server-instance \
-  meta globally-unique=false clone-max=2 clone-node-max=1
-group g-proxy proxy-vip proxy
-# Spread resources across nodes
-location l-proxy-on-webui g-proxy 200: webui
-location l-web-on-node1 cl-servers 200: node1
-location l-web-on-node2 cl-servers 200: node2
-# start clusterfs before web servers
-order clusterfs-then-servers Mandatory: c-clusterfs cl-servers
diff --git a/salt/salt/files/global_common.conf b/salt/salt/files/global_common.conf
deleted file mode 100644
index d628bc0bb..000000000
--- a/salt/salt/files/global_common.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# DRBD is the result of over a decade of development by LINBIT.
-# In case you need professional services for DRBD or have
-# feature requests visit http://www.linbit.com
-
-global {
-	usage-count no;
-}
-
-common {
-	handlers {
-	}
-
-	startup {
-		wfc-timeout 100;
-		degr-wfc-timeout 120;
-	}
-
-	options {
-	}
-
-	disk {
-	}
-
-	net {
-	}
-}
diff --git a/salt/salt/files/haproxy.cfg b/salt/salt/files/haproxy.cfg
deleted file mode 100644
index c3407ab34..000000000
--- a/salt/salt/files/haproxy.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-global
-  maxconn 256
-  daemon
-
-defaults
-  mode http
-  timeout connect 5000ms
-  timeout client 50000ms
-  timeout server 50000ms
-
-listen http-in
-  bind 10.13.37.20:80
-  server server1 10.13.37.10:8000 check
-  server server2 10.13.37.11:8000 check
-  server server3 10.13.37.12:8000 check
-  stats enable
diff --git a/salt/salt/files/hawk-development.service b/salt/salt/files/hawk-development.service
deleted file mode 100644
index 50cc04818..000000000
--- a/salt/salt/files/hawk-development.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=HA Web Konsole Development
-After=network.target
-
-[Service]
-Type=simple
-KillMode=control-group
-TimeoutSec=300
-TimeoutStopSec=10
-
-User=hacluster
-Group=haclient
-
-WorkingDirectory=/vagrant/hawk
-
-Environment="HAWK_ENV=development"
-
-# Run ExecStartPre with root-permissions
-PermissionsStartOnly=true
-ExecStartPre=/vagrant/hawk/bin/generate-ssl-cert
-ExecStart=/usr/bin/puma.ruby2.1 -C /vagrant/hawk/config/puma.rb
-ExecStop=/usr/bin/pumactl.ruby2.1 -S /vagrant/hawk/tmp/pids/puma.state stop
-ExecReload=/usr/bin/pumactl.ruby2.1 -S /vagrant/hawk/tmp/pids/puma.state restart
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/salt/salt/files/index.html b/salt/salt/files/index.html
deleted file mode 100644
index 8dc81e37f..000000000
--- a/salt/salt/files/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Cluster web server test</title>
-  </head>
-  <body>
-    <h1>Cluster web server test</h1>
-    <p>This is node {{ hostname }}.
-    </p>
-  </body>
-</html>
diff --git a/salt/salt/files/r0.res b/salt/salt/files/r0.res
deleted file mode 100644
index 0754d4f4b..000000000
--- a/salt/salt/files/r0.res
+++ /dev/null
@@ -1,23 +0,0 @@
-resource r0 {
-	device /dev/drbd0;
-	disk {{ disk }};
-	meta-disk internal;
-	on webui {
-		address 10.13.37.10:7788;
-		node-id 0;
-	}
-	on node1 {
-		address 10.13.37.11:7788;
-		node-id 1;
-	}
-	on node2 {
-		address 10.13.37.12:7788;
-		node-id 2;
-	}
-	disk {
-		resync-rate 1M;
-	}
-	connection-mesh {
-		hosts webui node1 node2;
-	}
-}
diff --git a/salt/salt/hawkdev/init.sls b/salt/salt/hawkdev/init.sls
deleted file mode 100644
index 6b4f2f4ee..000000000
--- a/salt/salt/hawkdev/init.sls
+++ /dev/null
@@ -1,57 +0,0 @@
-webui_packages:
-  pkg.installed:
-    - names:
-      - pam-devel
-      - libglue-devel
-
-salt://utils/install_tools.sh:
-  cmd.script:
-    - require:
-      - pkg: webui_packages
-
-salt://utils/init_cluster.sh:
-  cmd.script:
-    - require:
-      - cmd: "salt://utils/install_tools.sh"
-    - env:
-{% if 'vdb' in grains['disks'] %}
-      - PDEV: /dev/vdb
-      - PDEV2: /dev/vdb2
-{% else %}
-      - PDEV: /dev/sdb
-      - PDEV2: /dev/sdb2
-{% endif %}
-
-salt://utils/configure_drbd.sh:
-  cmd.script:
-    - require:
-      - file: /etc/drbd.d/global_common.conf
-      - file: /etc/drbd.d/r0.res
-      - cmd: "salt://utils/init_cluster.sh"
-
-/root/initial.crm:
-  file.managed:
-    - source: salt://files/crm-initial.conf
-
-apply_initial_configuration:
-  cmd.run:
-    - name: crm configure load update /root/initial.crm
-    - require:
-      - file: /root/initial.crm
-      - cmd: "salt://utils/configure_drbd.sh"
-
-
-/etc/systemd/system/hawk-development.service:
-  file.managed:
-    - source: salt://files/hawk-development.service
-    - user: root
-    - group: root
-    - mode: 644
-
-/usr/bin/hawk:
-  file.managed:
-    - source: /vagrant/hawk/bin/hawk
-    - user: root
-    - group: root
-    - mode: 755
-
diff --git a/salt/salt/joins/init.sls b/salt/salt/joins/init.sls
deleted file mode 100644
index 6c6373f7b..000000000
--- a/salt/salt/joins/init.sls
+++ /dev/null
@@ -1,4 +0,0 @@
-salt://utils/join_cluster.sh:
-  cmd.script:
-    - runas: root
-
diff --git a/salt/salt/sshkeys/ayoub.pub b/salt/salt/sshkeys/ayoub.pub
deleted file mode 100644
index d50393bab..000000000
--- a/salt/salt/sshkeys/ayoub.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6PfkGxVj5jyBBGS2AwR4mWJRqR0rmChVTJeslBUtptMTij71EVxooYjE/M5wwffXOB+2WRgAlABaHxRgMKl6cy72EqanQswZ2qSVJvT0w6ZOTIqtqc4ZUsDFQxUoClyZiv3L52B+ZunB3aJGpi9OxL5pq3UikwT0LfiL/saGrbJlwQ2mKw02qD5l4WTyHAedb0hxb2V9ikQwUm7l2xbvsOLakSzu76TLWXMUniqywKWHJGbQlGjG7/aaUmCYgtLEquu6v9iX0K/8i350nK2/qzuPpIrF3PsMCoqiHvvMx01K2hrfDNzTziJYJOhQDxtcfYTlW/JsdcDmy6gkrzVSxhQAmkk5L6pTTjJ/9Vqc+Pu/cya5Q2Can/kP2koYMqfD4+5YTXDXnlHNwzhOELi7RsOb0wACXkE8C0Zcpi8gqUIr2Z02tk4O+ct0MTsGHNCJHsgVTAwd+HZ418pCPDCg1Z90lKKfIMoQbFUQy9Z+z8oHLrL/Ti4Q7NpoVbPwrVAUJQyxudamc7I/mU1czSogI9fsBtK+O7C/QhbSa21ZyvKoUl/9zCDpsjC7XQXXzOY2DVgbIEhhPvCElY2mKce6FGxyKAn+Kn4qC3t5HzSQ9gPq7NEFpWm4Is8nc/JD0Epdv2DlWagZD4eViYtcS9J+cqVCDSYck5WXdqOc1s+p+aQ== belarbi.ayoub@gmail.com
diff --git a/salt/salt/sshkeys/krig.pub b/salt/salt/sshkeys/krig.pub
deleted file mode 100644
index 62553ac26..000000000
--- a/salt/salt/sshkeys/krig.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzma1vLqNyJneb/AwLdvcJr9SeXaE3zPU7V9uVsAMcV9U0uCdWKBiyB8+0amd8kcfdqs0Wm5qh5hdCLTsJ+xL5N/DmnOK1cNkg5jwBbgfxJpb1DY617YuDJ6bWouwQfZCF/Kc2lhYpaq0POr+bdIQX5UpQH2bWuykarjlxUIG7GQSd8xs0FB9Uvmx/DM4tMoG8Vd8stT5tMFqWQ8af/yqPuAr9LfB98F3Rucr3rrPQpvEwCay95RoruNJcn19ZWhpi2tUSIrwnmxZHot7RpAg8EN+d/U0jWNiXeNEET3c5BrlcCXkSqzfjPaQNrIiuFNiy6gh9/XJpuU041tGuCJ/4Q== krig@fenris
diff --git a/salt/salt/sshkeys/vagrant b/salt/salt/sshkeys/vagrant
deleted file mode 100644
index 7d6a08390..000000000
--- a/salt/salt/sshkeys/vagrant
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
-w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
-kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
-hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
-Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
-yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
-ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
-Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
-TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
-iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
-sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
-4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
-cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
-EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
-CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
-3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
-YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
-3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
-dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
-6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
-P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
-llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
-kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
-+vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
-NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
------END RSA PRIVATE KEY-----
diff --git a/salt/salt/sshkeys/vagrant.pub b/salt/salt/sshkeys/vagrant.pub
deleted file mode 100644
index 18a9c00fd..000000000
--- a/salt/salt/sshkeys/vagrant.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
diff --git a/salt/salt/top.sls b/salt/salt/top.sls
deleted file mode 100644
index 61813258c..000000000
--- a/salt/salt/top.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-base:
-  '*':
-    - common
-  webui:
-    - hawkdev
-  'node*':
-    - joins
-
diff --git a/salt/salt/utils/configure_drbd.sh b/salt/salt/utils/configure_drbd.sh
deleted file mode 100755
index e45d4133b..000000000
--- a/salt/salt/utils/configure_drbd.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-crm configure show ms-DRBD 1>/dev/null 2>&1 && exit
-drbdadm dump all
-drbdadm create-md r0
-drbdadm up r0
-drbdadm new-current-uuid --clear-bitmap r0/0
-drbdadm primary --force r0
-mkfs.ext4 /dev/drbd0
-crm script run drbd id=DRBD drbd_resource=r0
diff --git a/salt/salt/utils/init_cluster.sh b/salt/salt/utils/init_cluster.sh
deleted file mode 100755
index 9dc3c9a9f..000000000
--- a/salt/salt/utils/init_cluster.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-systemctl -q is-active pacemaker && exit
-[ "$(hostname)" != "webui" ] && exit
-
-# Check if OCFS2 disk is already
-# formatted for a different cluster name...
-if [ -e "$PDEV2" ] && tunefs.ocfs2 -Q "%N" "$PDEV2" 1>/dev/null 2>&1; then
-	mkfs.ocfs2 --force --cluster-stack pcmk --cluster-name hawkdev -N 4 -x "$PDEV2"
-fi
-
-/usr/sbin/crm cluster init --name "hawkdev" -y -i eth1 -t ocfs2 -p $PDEV
-
-# Configure OCFS2 max node count
-if [ "$(tunefs.ocfs2 -Q "%N" "$PDEV2")" != "4" ]; then
-    crm -w resource stop c-clusterfs
-    tunefs.ocfs2 -N 4 "$PDEV2"
-    crm -w resource start c-clusterfs
-fi
diff --git a/salt/salt/utils/install_tools.sh b/salt/salt/utils/install_tools.sh
deleted file mode 100755
index 245293b45..000000000
--- a/salt/salt/utils/install_tools.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd /vagrant || exit
-make WITHIN_VAGRANT=1 WWW_BASE=/vagrant clean
-make WITHIN_VAGRANT=1 WWW_BASE=/vagrant tools/hawk_chkpwd tools/hawk_monitor tools/hawk_invoke
-make WITHIN_VAGRANT=1 WWW_BASE=/vagrant tools/install
diff --git a/salt/salt/utils/join_cluster.sh b/salt/salt/utils/join_cluster.sh
deleted file mode 100755
index 9a8d7229b..000000000
--- a/salt/salt/utils/join_cluster.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-systemctl -q is-active pacemaker && exit
-[ "$(hostname)" = "webui" ] && exit
-while true; do
-	ping -q -c 1 10.13.37.10 >/dev/null && break
-	echo "[webui] First cluster node not yet online..."
-	sleep 5
-done
-while true; do
-	ssh -o StrictHostKeyChecking=no root@10.13.37.10 /usr/sbin/crm_mon -1 >/dev/null && break
-	echo "[webui] Cluster not yet initialized..."
-	sleep 5
-done
-/usr/sbin/crm cluster join -c 10.13.37.10 -i eth1 -y
diff --git a/salt/salt/utils/modify_shebangs.sh b/salt/salt/utils/modify_shebangs.sh
deleted file mode 100755
index f0200031e..000000000
--- a/salt/salt/utils/modify_shebangs.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-sed -i 's$#!/.*$#!/usr/bin/ruby.ruby2.1$' /vagrant/hawk/bin/rails
-sed -i 's$#!/.*$#!/usr/bin/ruby.ruby2.1$' /vagrant/hawk/bin/rake
-sed -i 's$#!/.*$#!/usr/bin/ruby.ruby2.1$' /vagrant/hawk/bin/bundle