fix(*): remove deprecated @1 unit names

bshawk · Oct 18, 2014 · 14e0ad9 · 14e0ad9
1 parent aee7c7c
commit 14e0ad9
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 37 deletions.
diff --git a/builder/Makefile b/builder/Makefile
@@ -15,10 +15,10 @@ full-clean: check-docker check-registry clean
 	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
 
 install: check-deisctl
-	deisctl scale $(COMPONENT)=1
+	deisctl install $(COMPONENT)
 
 uninstall: check-deisctl
-	deisctl scale $(COMPONENT)=0
+	deisctl uninstall $(COMPONENT)
 
 start: check-deisctl
 	deisctl start $(COMPONENT)

diff --git a/cache/Makefile b/cache/Makefile
@@ -20,10 +20,10 @@ full-clean: check-docker check-registry
 	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
 
 install: check-deisctl
-	deisctl scale $(COMPONENT)=1
+	deisctl install $(COMPONENT)
 
 uninstall: check-deisctl
-	deisctl scale $(COMPONENT)=0
+	deisctl uninstall $(COMPONENT)
 
 start: check-deisctl
 	deisctl start $(COMPONENT)

diff --git a/contrib/gce/README.md b/contrib/gce/README.md
@@ -318,13 +318,13 @@ Verify that all the units are active after the operation completes:
 ```console
 $ deisctl list
 UNIT                        MACHINE                     LOAD    ACTIVE  SUB
-deis-builder@1.service      dea53588.../172.17.8.100    loaded  active  running
-deis-cache@1.service        dea53588.../172.17.8.100    loaded  active  running
-deis-controller@1.service   dea53588.../172.17.8.100    loaded  active  running
-deis-database@1.service     dea53588.../172.17.8.100    loaded  active  running
+deis-builder.service        dea53588.../172.17.8.100    loaded  active  running
+deis-cache.service          dea53588.../172.17.8.100    loaded  active  running
+deis-controller.service     dea53588.../172.17.8.100    loaded  active  running
+deis-database.service       dea53588.../172.17.8.100    loaded  active  running
 deis-logger-data.service    dea53588.../172.17.8.100    loaded  active  exited
-deis-logger@1.service       dea53588.../172.17.8.100    loaded  active  running
-deis-registry@1.service     dea53588.../172.17.8.100    loaded  active  running
+deis-logger.service         dea53588.../172.17.8.100    loaded  active  running
+deis-registry.service       dea53588.../172.17.8.100    loaded  active  running
 [email protected]       dea53588.../172.17.8.100    loaded  active  running
 ```
 

diff --git a/controller/Makefile b/controller/Makefile
@@ -18,10 +18,10 @@ full-clean: check-docker check-registry
 	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
 
 install: check-deisctl
-	deisctl scale $(COMPONENT)=1
+	deisctl install $(COMPONENT)
 
 uninstall: check-deisctl
-	deisctl scale $(COMPONENT)=0
+	deisctl uninstall $(COMPONENT)
 
 start: check-deisctl
 	deisctl start $(COMPONENT)

diff --git a/database/Makefile b/database/Makefile
@@ -14,10 +14,10 @@ full-clean: check-docker check-registry
 	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
 
 install: check-deisctl
-	deisctl scale $(COMPONENT)=1
+	deisctl install $(COMPONENT)
 
 uninstall: check-deisctl
-	deisctl scale $(COMPONENT)=0
+	deisctl uninstall $(COMPONENT)
 
 start: check-deisctl
 	deisctl start $(COMPONENT)

diff --git a/deisctl/deisctl.go b/deisctl/deisctl.go
@@ -64,7 +64,7 @@ Commands:
 
 Example Commands:
   deisctl install platform
-  deisctl uninstall builder@1
+  deisctl uninstall builder
   deisctl scale router=2
   deisctl start router@2
   deisctl stop router builder

diff --git a/docs/managing_deis/backing_up_data.rst b/docs/managing_deis/backing_up_data.rst
@@ -29,7 +29,7 @@ dump of the database.
 
 .. code-block:: console
 
-    dev $ fleetctl ssh deis-database@1.service
+    dev $ fleetctl ssh deis-database.service
     coreos $ nse deis-database
     coreos $ sudo -u postgres pg_dumpall > pg_dump.sql
 

diff --git a/logger/Makefile b/logger/Makefile
@@ -20,10 +20,10 @@ full-clean: check-docker check-registry
 	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
 
 install: check-deisctl
-	deisctl scale $(COMPONENT)=1
+	deisctl install $(COMPONENT)
 
 uninstall: check-deisctl
-	deisctl scale $(COMPONENT)=0
+	deisctl uninstall $(COMPONENT)
 
 start: check-deisctl
 	deisctl start $(COMPONENT)

diff --git a/registry/Makefile b/registry/Makefile
@@ -14,10 +14,10 @@ full-clean: check-docker check-registry
 	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
 
 install: check-deisctl
-	deisctl scale $(COMPONENT)=1
+	deisctl install $(COMPONENT)
 
 uninstall: check-deisctl
-	deisctl scale $(COMPONENT)=0
+	deisctl uninstall $(COMPONENT)
 
 start: check-deisctl
 	deisctl start $(COMPONENT)

diff --git a/store/Makefile b/store/Makefile
@@ -44,20 +44,20 @@ full-clean: check-docker check-registry
 install: check-deisctl
 	deisctl install store-monitor
 	deisctl install store-daemon
-	deisctl scale store-gateway=1
+	deisctl install store-gateway
 
 uninstall: check-deisctl
-	deisctl scale store-gateway=0
+	deisctl uninstall store-gateway
 	deisctl uninstall store-daemon
 	deisctl uninstall store-monitor
 
 start: check-deisctl
 	deisctl start store-monitor
 	deisctl start store-daemon
-	deisctl start store-gateway@1
+	deisctl start store-gateway
 
 stop: check-deisctl
-	deisctl stop store-gateway@1
+	deisctl stop store-gateway
 	deisctl stop store-daemon
 	deisctl stop store-monitor
 

diff --git a/tests/bin/test-acceptance.sh b/tests/bin/test-acceptance.sh
@@ -59,8 +59,6 @@ set_release controller ${OLD_TAG}
 set_release registry ${OLD_TAG}
 
 deisctl install platform
-deisctl scale router=3
-deisctl start router@1 router@2 router@3
 time deisctl start platform
 
 log_phase "Running smoke tests"

diff --git a/tests/bin/test-integration.sh b/tests/bin/test-integration.sh
@@ -54,8 +54,6 @@ make dev-release
 log_phase "Provisioning Deis"
 
 deisctl install platform
-deisctl scale router=3
-deisctl start router@1 router@2 router@3
 time deisctl start platform
 
 log_phase "Running integration suite"

diff --git a/tests/bin/test-latest.sh b/tests/bin/test-latest.sh
@@ -56,8 +56,6 @@ log_phase "Provisioning Deis"
 
 # provision deis from master using :latest
 deisctl install platform
-deisctl scale router=3
-deisctl start router@1 router@2 router@3
 time deisctl start platform
 
 log_phase "Running integration tests"

diff --git a/tests/bin/test-setup.sh b/tests/bin/test-setup.sh
@@ -98,11 +98,11 @@ function dump_logs {
   export FLEETCTL_TUNNEL=$DEISCTL_TUNNEL
   set -x
   fleetctl -strict-host-key-checking=false list-units
-  fleetctl -strict-host-key-checking=false ssh deis-controller@1 etcdctl ls / --recursive
-  fleetctl -strict-host-key-checking=false ssh deis-controller@1 docker logs deis-controller
-  fleetctl -strict-host-key-checking=false ssh deis-registry@1 docker logs deis-registry
-  fleetctl -strict-host-key-checking=false ssh deis-builder@1 docker logs deis-builder
-  fleetctl -strict-host-key-checking=false ssh deis-logger@1 docker logs deis-logger
+  fleetctl -strict-host-key-checking=false ssh deis-controller etcdctl ls / --recursive
+  fleetctl -strict-host-key-checking=false ssh deis-controller docker logs deis-controller
+  fleetctl -strict-host-key-checking=false ssh deis-registry docker logs deis-registry
+  fleetctl -strict-host-key-checking=false ssh deis-builder docker logs deis-builder
+  fleetctl -strict-host-key-checking=false ssh deis-logger docker logs deis-logger
   set +x
   exit 1
 }
diff --git a/tests/bin/test-smoke.sh b/tests/bin/test-smoke.sh
@@ -53,8 +53,6 @@ make dev-release
 log_phase "Provisioning Deis"
 
 time deisctl install platform
-deisctl scale router=3
-deisctl start router@1 router@2 router@3
 time deisctl start platform
 
 log_phase "Starting smoke tests"