Removes pgpool, going back to single appdb

4 files changed, 6 insertions, 61 deletions

diff --git a/Vagrantfile b/Vagrantfile
index 0753d8d..c540977 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -128,38 +128,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     appdb1.vm.network "private_network", ip: "10.0.0.16"
   end
 
-  config.vm.define "appdb2", autostart: false do |appdb2|
-    appdb2.vm.provider "aws" do |aws, override|
-      aws.private_ip_address = "10.0.0.26"
-      aws.block_device_mapping = [{
-        'VirtualName' => "postgresql_data",
-        'DeviceName' => '/dev/sda1',
-        'Ebs.VolumeSize' => 50,
-        'Ebs.DeleteOnTermination' => true,
-        'Ebs.VolumeType' => 'io1',
-        'Ebs.Iops' => 500
-      }]
-
-      override.vm.provision :shell, :path => "vagrant_scripts/appdb_aws.sh"
-    end
-
-    appdb2.vm.provision :shell, :path => "vagrant_scripts/pg93_bootstrap.sh"
-    appdb2.vm.provision :shell, :path => "vagrant_scripts/appdb_bootstrap.sh"
-    appdb2.vm.box = "ubuntu/trusty64"
-    appdb2.vm.network "private_network", ip: "10.0.0.26"
-  end
-
-  config.vm.define "pgpool" do |pgpool|
-    pgpool.vm.provision :shell, :path => "vagrant_scripts/pgpool_bootstrap.sh"
-    pgpool.vm.box = "ubuntu/trusty64"
-    pgpool.vm.network "private_network", ip: "10.0.0.20"
-
-    pgpool.vm.provider "aws" do |aws, override|
-      aws.instance_type = "t2.micro"
-      aws.private_ip_address = "10.0.0.20"
-    end
-  end
-
   config.vm.define "idm", primary: true do |idm|
 
     idm.vm.box = "ubuntu/trusty64"
diff --git a/vagrant_scripts/appdb_bootstrap.sh b/vagrant_scripts/appdb_bootstrap.sh
index b1c4053..5539897 100755
--- a/vagrant_scripts/appdb_bootstrap.sh
+++ b/vagrant_scripts/appdb_bootstrap.sh
@@ -1,6 +1,6 @@
 
-# no login required for pgpool
-echo "host    all             all             10.0.0.20/32            trust" >> /etc/postgresql/9.3/main/pg_hba.conf
+echo "host    all             all             10.0.0.14/32            md5" >> /etc/postgresql/9.3/main/pg_hba.conf
+echo "host    all             all             10.0.0.24/32            md5" >> /etc/postgresql/9.3/main/pg_hba.conf
 service postgresql reload
 
 # initialize the sqlfiddle central database, which has all sqlfiddle-specific data structures
@@ -10,4 +10,4 @@ psql -U postgres sqlfiddle < /vagrant/src/main/resources/db/sqlfiddle/data.sql
 
 # initialize the openidm repository
 psql -U postgres < /vagrant/src/main/resources/db/openidm/createuser.pgsql
-psql -U openidm < /vagrant/src/main/resources/db/openidm/openidm.pgsql
\ No newline at end of file
+psql -U openidm < /vagrant/src/main/resources/db/openidm/openidm.pgsql
diff --git a/vagrant_scripts/idm_prep.sh b/vagrant_scripts/idm_prep.sh
index 7d2b63f..1cc5bc0 100755
--- a/vagrant_scripts/idm_prep.sh
+++ b/vagrant_scripts/idm_prep.sh
@@ -21,9 +21,9 @@ echo "export JAVA_OPTS=\"${JAVA_OPTS}\"" >> /etc/profile
 
 echo "10.0.0.14 openidm1" >> /etc/hosts
 echo "10.0.0.24 openidm2" >> /etc/hosts
-echo "10.0.0.20 OPENIDM_REPO_HOST" >> /etc/hosts
-echo "10.0.0.20 SQLFIDDLE_HOST" >> /etc/hosts
-echo "10.0.0.16 POSTGRESQL93_HOST" >> /etc/hosts
+echo "10.0.0.16 OPENIDM_REPO_HOST" >> /etc/hosts
+echo "10.0.0.16 SQLFIDDLE_HOST" >> /etc/hosts
+echo "10.0.0.19 POSTGRESQL93_HOST" >> /etc/hosts
 echo "10.0.0.15 MYSQL56_HOST" >> /etc/hosts
 echo "10.0.0.17 ORACLE11G_HOST" >> /etc/hosts
 echo "10.0.0.17 SQLSERVER2014_HOST" >> /etc/hosts
diff --git a/vagrant_scripts/pgpool_bootstrap.sh b/vagrant_scripts/pgpool_bootstrap.sh
deleted file mode 100755
index 2303a7f..0000000
--- a/vagrant_scripts/pgpool_bootstrap.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-
-echo "10.0.0.16 APPDB1" >> /etc/hosts
-echo "10.0.0.26 APPDB2" >> /etc/hosts
-
-
-apt-get --yes update
-apt-get --yes upgrade
-apt-get --yes --force-yes install pgpool2=3.3.2-1ubuntu1 libpgpool0=3.3.2-1ubuntu1
-
-cp /vagrant/src/main/resources/db/sqlfiddle/pgpool.conf /etc/pgpool2/pgpool.conf
-chown postgres /etc/pgpool2/*
-
-
-echo postgres:`pg_md5 password` >> /etc/pgpool2/pcp.conf
-echo "host    all             all             10.0.0.14/32            trust" >> /etc/pgpool2/pool_hba.conf
-echo "host    all             all             10.0.0.24/32            trust" >> /etc/pgpool2/pool_hba.conf
-
-mkdir /APPDB1_data
-mkdir /APPDB2_data
-
-chown postgres /APPDB*_data
-
-service pgpool2 restart