remove redundant naming in file, use less aggressive naming

pypi · Nov 24, 2013 · 4c3c92a · 4c3c92a
1 parent 058c333
commit 4c3c92a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -20,7 +20,7 @@ Vagrant.configure("2") do |config|
 
       pypi.vm.provision :salt do |s|
         s.verbose = true
-        s.minion_config = "provisioning/salt/minion/pypi-minion"
+        s.minion_config = "provisioning/salt/minion/pypi"
         s.run_highstate = true
       end
     end
@@ -31,7 +31,7 @@ Vagrant.configure("2") do |config|
 
       mirror.vm.provision :salt do |s|
         s.verbose = true
-        s.minion_config = "provisioning/salt/minion/mirror-minion"
+        s.minion_config = "provisioning/salt/minion/mirror"
         s.run_highstate = true
       end
     end
@@ -45,7 +45,7 @@ Vagrant.configure("2") do |config|
 
       pg_master.vm.provision :salt do |s|
         s.verbose = true
-        s.minion_config = "provisioning/salt/minion/pg_cluster-master-minion"
+        s.minion_config = "provisioning/salt/minion/pg_cluster-primary"
         s.run_highstate = true
       end
     end
@@ -56,7 +56,7 @@ Vagrant.configure("2") do |config|
 
       pg_slave.vm.provision :salt do |s|
         s.verbose = true
-        s.minion_config = "provisioning/salt/minion/pg_cluster-slave-minion"
+        s.minion_config = "provisioning/salt/minion/pg_cluster-standby0"
         s.run_highstate = true
       end
     end

diff --git a/provisioning/salt/minion/mirror-minion → provisioning/salt/minion/mirror b/provisioning/salt/minion/mirror-minion → provisioning/salt/minion/mirror
diff --git a/...ning/salt/minion/pg_cluster-master-minion → provisioning/salt/minion/pg_cluster-primary b/...ning/salt/minion/pg_cluster-master-minion → provisioning/salt/minion/pg_cluster-primary
diff --git a/...oning/salt/minion/pg_cluster-slave-minion → provisioning/salt/minion/pg_cluster-standby0 b/...oning/salt/minion/pg_cluster-slave-minion → provisioning/salt/minion/pg_cluster-standby0
diff --git a/provisioning/salt/minion/pypi-minion → provisioning/salt/minion/pypi b/provisioning/salt/minion/pypi-minion → provisioning/salt/minion/pypi