prune postgres clustering, pgpool, glusterfs

pypi · Jun 11, 2016 · 0a64cda · 0a64cda
1 parent cf3c0fa
commit 0a64cda
Show file tree

Hide file tree

Showing 38 changed files with 0 additions and 1,458 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -110,108 +110,4 @@ Vagrant.configure("2") do |config|
     end
   end
 
-  if ENV['VAGRANT_POSTGRES_CLUSTER'] == '1'
-
-    config.vm.define "pg_primary" do |pg_primary|
-      pg_primary.vm.network "private_network", ip: "192.168.57.5"
-      pg_primary.vm.network "private_network", ip: "172.16.57.5"
-
-      pg_primary.vm.provision :salt do |s|
-        s.verbose = true
-        s.install_type = "git v0.17.2"
-        s.minion_config = "provisioning/salt/minion/pg_cluster/primary"
-        s.run_highstate = true
-      end
-    end
-
-    config.vm.define "pg_standby_0" do |pg_standby_0|
-      pg_standby_0.vm.network "private_network", ip: "192.168.57.6"
-      pg_standby_0.vm.network "private_network", ip: "172.16.57.6"
-
-      pg_standby_0.vm.provision :salt do |s|
-        s.verbose = true
-        s.install_type = "git v0.17.2"
-        s.minion_config = "provisioning/salt/minion/pg_cluster/standby_0"
-        s.run_highstate = true
-      end
-    end
-
-    config.vm.define "pgpool_0" do |pgpool_0|
-      pgpool_0.vm.network "private_network", ip: "192.168.57.7"
-      pgpool_0.vm.network "private_network", ip: "172.16.57.7"
-
-      pgpool_0.vm.provision :salt do |s|
-        s.verbose = true
-        s.install_type = "git v0.17.2"
-        s.minion_config = "provisioning/salt/minion/pg_cluster/pgpool_0"
-        s.run_highstate = true
-      end
-    end
-
-    config.vm.define "pgpool_1" do |pgpool_1|
-      pgpool_1.vm.network "private_network", ip: "192.168.57.8"
-      pgpool_1.vm.network "private_network", ip: "172.16.57.8"
-
-      pgpool_1.vm.provision :salt do |s|
-        s.verbose = true
-        s.install_type = "git v0.17.2"
-        s.minion_config = "provisioning/salt/minion/pg_cluster/pgpool_1"
-        s.run_highstate = true
-      end
-    end
-
-  end
-
-  if ENV['VAGRANT_GLUSTER'] == '1'
-
-    config.vm.define "gluster_0" do |gluster_0|
-      gluster_0.vm.network "private_network", ip: "192.168.57.30"
-      gluster_0.vm.network "private_network", ip: "172.16.57.30"
-
-      gluster_0.vm.provider :virtualbox do |vm|
-        file_to_disk = '.vagrant/tmp/gluster_0.vdi'
-        vm.customize ['createhd', '--filename', file_to_disk, '--size', 10 * 1024]
-        vm.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', 1, '--device', 0, '--type', 'hdd', '--medium', file_to_disk]
-      end
-
-      gluster_0.vm.provision :salt do |s|
-        s.verbose = true
-        s.install_type = "git v0.17.2"
-        s.minion_config = "provisioning/salt/minion/gluster_cluster/node"
-        s.run_highstate = true
-      end
-    end
-
-    config.vm.define "gluster_1" do |gluster_1|
-      gluster_1.vm.network "private_network", ip: "192.168.57.31"
-      gluster_1.vm.network "private_network", ip: "172.16.57.31"
-
-      gluster_1.vm.provider :virtualbox do |vm|
-        file_to_disk = '.vagrant/tmp/gluster_1.vdi'
-        vm.customize ['createhd', '--filename', file_to_disk, '--size', 10 * 1024]
-        vm.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', 1, '--device', 0, '--type', 'hdd', '--medium', file_to_disk]
-      end
-
-      gluster_1.vm.provision :salt do |s|
-        s.verbose = true
-        s.install_type = "git v0.17.2"
-        s.minion_config = "provisioning/salt/minion/gluster_cluster/node"
-        s.run_highstate = true
-      end
-    end
-
-    config.vm.define "gluster_client" do |gluster_client|
-      gluster_client.vm.network "private_network", ip: "192.168.57.39"
-      gluster_client.vm.network "private_network", ip: "172.16.57.39"
-
-      gluster_client.vm.provision :salt do |s|
-        s.verbose = true
-        s.install_type = "git v0.17.2"
-        s.minion_config = "provisioning/salt/minion/gluster_cluster/client"
-        s.run_highstate = true
-      end
-    end
-
-  end
-
 end
diff --git a/provisioning/salt/minion/gluster_cluster/client b/provisioning/salt/minion/gluster_cluster/client
diff --git a/provisioning/salt/minion/gluster_cluster/node b/provisioning/salt/minion/gluster_cluster/node
diff --git a/provisioning/salt/minion/pg_cluster/pgpool_0 b/provisioning/salt/minion/pg_cluster/pgpool_0
diff --git a/provisioning/salt/minion/pg_cluster/pgpool_1 b/provisioning/salt/minion/pg_cluster/pgpool_1
diff --git a/provisioning/salt/minion/pg_cluster/primary b/provisioning/salt/minion/pg_cluster/primary
diff --git a/provisioning/salt/minion/pg_cluster/standby_0 b/provisioning/salt/minion/pg_cluster/standby_0
diff --git a/provisioning/salt/roots/pillar/backup/server.sls b/provisioning/salt/roots/pillar/backup/server.sls
@@ -3,16 +3,6 @@ backup-server:
   volumes:
     /dev/sdb: /backup
   backups:
-    postgres-archives:
-      directory: /backup/postgres/archives
-      user: postgres
-      increment_retention: 10m
-      authorized_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxqABhu46JE5zT68uNwpBdmqI/eYfepfA9PU8AxbGR96u5rPd8xyKJ2ZzTUgjrCKWLim4jutFgAtfCwkfjm/FrHQWNJZhZtQ1gT8a/bpIjHddjOFlELja1vFKkQsU6dsmYGTZxwByeMQl1+TWE5xmGrmqsgNnK+Twi01TCUmYs36M8OQGXle664XAapfc+4cAU4Clf3mH7xFIBJnCS12v5ES1J4pmnfBVMT85lGJMDW/vDI5Yx2A85bKOCwle1XpGsxLLfvvg7faNiCBjpj//pSEAI52tSq0hLtYSS5WJBz1tfJQPECCXVxa6LHKJB6RDT3eYyMQSugFSCrHxQ8j/F
-    postgres-base:
-      directory: /backup/postgres/base
-      user: postgres
-      increment_retention: 10m
-      authorized_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxqABhu46JE5zT68uNwpBdmqI/eYfepfA9PU8AxbGR96u5rPd8xyKJ2ZzTUgjrCKWLim4jutFgAtfCwkfjm/FrHQWNJZhZtQ1gT8a/bpIjHddjOFlELja1vFKkQsU6dsmYGTZxwByeMQl1+TWE5xmGrmqsgNnK+Twi01TCUmYs36M8OQGXle664XAapfc+4cAU4Clf3mH7xFIBJnCS12v5ES1J4pmnfBVMT85lGJMDW/vDI5Yx2A85bKOCwle1XpGsxLLfvvg7faNiCBjpj//pSEAI52tSq0hLtYSS5WJBz1tfJQPECCXVxa6LHKJB6RDT3eYyMQSugFSCrHxQ8j/F
     devpypi-files:
       directory: /backup/devpypi/files
       user: devpypi

diff --git a/provisioning/salt/roots/pillar/glusterfs/server.sls b/provisioning/salt/roots/pillar/glusterfs/server.sls
diff --git a/provisioning/salt/roots/pillar/postgresql/cluster.sls b/provisioning/salt/roots/pillar/postgresql/cluster.sls
diff --git a/provisioning/salt/roots/pillar/postgresql/pgpool.sls b/provisioning/salt/roots/pillar/postgresql/pgpool.sls
diff --git a/provisioning/salt/roots/pillar/secrets/backup/postgres.sls b/provisioning/salt/roots/pillar/secrets/backup/postgres.sls
diff --git a/provisioning/salt/roots/pillar/secrets/monitoring/client/postgresql.sls b/provisioning/salt/roots/pillar/secrets/monitoring/client/postgresql.sls
diff --git a/provisioning/salt/roots/pillar/secrets/postgresql.sls b/provisioning/salt/roots/pillar/secrets/postgresql.sls