From 884fed539dd28d4174d7ee640ac391565bcecbdc Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Wed, 19 Mar 2014 13:22:56 -0600 Subject: [PATCH] Replaced refs to server and worker with controller. --- contrib/digitalocean/prepare-controller-image.sh | 3 +-- contrib/ec2/prepare-controller-ami.sh | 3 +-- contrib/rackspace/prepare-node-image.sh | 3 +-- contrib/vagrant/README.md | 4 ++-- contrib/vagrant/prepare-ubuntu-box.sh | 3 +-- contrib/vagrant/util/_controller-reset-db.sh | 4 ++-- contrib/vagrant/util/add_server_dev_deps.sh | 6 +++--- contrib/vagrant/util/dshell | 8 ++++---- controller/Makefile | 8 ++++---- controller/README.md | 4 ++-- docs/contributing/localdev.rst | 7 +++---- docs/contributing/releases.rst | 2 +- docs/cookbook/attributes.rst | 4 ++-- 13 files changed, 27 insertions(+), 32 deletions(-) diff --git a/contrib/digitalocean/prepare-controller-image.sh b/contrib/digitalocean/prepare-controller-image.sh index cdc8d84b44..d5e785a642 100755 --- a/contrib/digitalocean/prepare-controller-image.sh +++ b/contrib/digitalocean/prepare-controller-image.sh @@ -43,8 +43,7 @@ docker pull deis/registry:latest docker pull deis/cache:latest docker pull deis/logger:latest docker pull deis/database:latest -docker pull deis/server:latest -docker pull deis/worker:latest +docker pull deis/controller:latest docker pull deis/builder:latest # install chef 11.x deps diff --git a/contrib/ec2/prepare-controller-ami.sh b/contrib/ec2/prepare-controller-ami.sh index a9942e11ca..e2611da254 100755 --- a/contrib/ec2/prepare-controller-ami.sh +++ b/contrib/ec2/prepare-controller-ami.sh @@ -48,8 +48,7 @@ docker pull deis/registry:latest docker pull deis/cache:latest docker pull deis/logger:latest docker pull deis/database:latest -docker pull deis/server:latest -docker pull deis/worker:latest +docker pull deis/controller:latest docker pull deis/builder:latest # install chef 11.x deps diff --git a/contrib/rackspace/prepare-node-image.sh b/contrib/rackspace/prepare-node-image.sh index a639a6eff2..d594d41f57 100755 --- a/contrib/rackspace/prepare-node-image.sh +++ b/contrib/rackspace/prepare-node-image.sh @@ -49,8 +49,7 @@ docker pull deis/registry:latest docker pull deis/cache:latest docker pull deis/logger:latest docker pull deis/database:latest -docker pull deis/server:latest -docker pull deis/worker:latest +docker pull deis/controller:latest docker pull deis/builder:latest # install chef 11.x deps diff --git a/contrib/vagrant/README.md b/contrib/vagrant/README.md index e386e0c695..2452254fae 100644 --- a/contrib/vagrant/README.md +++ b/contrib/vagrant/README.md @@ -80,8 +80,8 @@ the one from Pip. * To use Django's manage.py: * SSH in to the VM with `vagrant ssh` - * Use `dsh deis-server` - * Get into the Django server's path `cd /app/deis` + * Use `dsh deis-controller` + * Get into the Django server's path `cd /app/deis/controller` * Get a list of commands with; `./manage.py help` * Django's native web admin interface is available at http://deis-controller.local:8000/admin/ diff --git a/contrib/vagrant/prepare-ubuntu-box.sh b/contrib/vagrant/prepare-ubuntu-box.sh index e391f532c6..556a65aeac 100755 --- a/contrib/vagrant/prepare-ubuntu-box.sh +++ b/contrib/vagrant/prepare-ubuntu-box.sh @@ -50,8 +50,7 @@ docker pull deis/registry:latest docker pull deis/cache:latest docker pull deis/logger:latest docker pull deis/database:latest -docker pull deis/server:latest -docker pull deis/worker:latest +docker pull deis/controller:latest docker pull deis/builder:latest # install chef 11.x deps diff --git a/contrib/vagrant/util/_controller-reset-db.sh b/contrib/vagrant/util/_controller-reset-db.sh index 4546102ec6..7c47fd580d 100755 --- a/contrib/vagrant/util/_controller-reset-db.sh +++ b/contrib/vagrant/util/_controller-reset-db.sh @@ -22,10 +22,10 @@ echo "Dropping and recreating Deis database..." echo "su postgres -c 'dropdb deis && createdb --encoding=utf8 --template=template0 deis'" | ./dshell deis-database echo "Running South migrations..." -echo '/app/deis/manage.py syncdb --migrate --noinput' | ./dshell deis-server +echo '/app/deis/controller/manage.py syncdb --migrate --noinput' | ./dshell deis-controller echo "Importing fixtures" -echo '/app/deis/manage.py loaddata /app/deis/api/fixtures/dev.json' | ./dshell deis-server +echo '/app/deis/controller/manage.py loaddata /app/deis/api/fixtures/dev.json' | ./dshell deis-controller # Most of the fixture data is generic. However the host machine's SSH credentials will change # from developer to developer. diff --git a/contrib/vagrant/util/add_server_dev_deps.sh b/contrib/vagrant/util/add_server_dev_deps.sh index 53f0313f8f..90806452d9 100755 --- a/contrib/vagrant/util/add_server_dev_deps.sh +++ b/contrib/vagrant/util/add_server_dev_deps.sh @@ -2,10 +2,10 @@ cd /vagrant/contrib/vagrant/util/ # Use the `coverage' command to signal whether the container has the dev dependencies -echo "which coverage > /dev/null" | ./dshell deis-server +echo "which coverage > /dev/null" | ./dshell deis-controller if [ $? -ne 0 ]; then - cat <<-EOF | ./dshell deis-server - cd /app/deis + cat <<-EOF | ./dshell deis-controller + cd /app/deis/controller pip install -r dev_requirements.txt EOF else diff --git a/contrib/vagrant/util/dshell b/contrib/vagrant/util/dshell index df0530b86f..1a092c3439 100755 --- a/contrib/vagrant/util/dshell +++ b/contrib/vagrant/util/dshell @@ -3,9 +3,9 @@ # Convenience script for getting a terminal session on a docker container. # Usage: ./dshell # Examples: -# `./dshell deis-server /bin/ls` lists the contents of the root home folder -# `./dshell deis-server` gives an interactive prompt -# echo "ls" | `./dshell deis-server` lists the contents of the root home folder +# `./dshell deis-controller /bin/ls` lists the contents of the root home folder +# `./dshell deis-controller` gives an interactive prompt +# echo "ls" | `./dshell deis-controller` lists the contents of the root home folder ID=$(docker inspect $1 | python -c 'import json,sys;obj=json.load(sys.stdin);print obj[0]["ID"]') -lxc-attach -n $ID $2 \ No newline at end of file +lxc-attach -n $ID $2 diff --git a/controller/Makefile b/controller/Makefile index 47478d3e29..f88dcac8f3 100644 --- a/controller/Makefile +++ b/controller/Makefile @@ -12,16 +12,16 @@ coverage: coverage html build: - docker build -t deis/server . + docker build -t deis/controller . run: - docker run -rm -p $${PORT:-8000}:$${PORT:-8000} -e ETCD=$${ETCD:-127.0.0.1:4001} -name deis-server deis/server ; exit 0 + docker run -rm -p $${PORT:-8000}:$${PORT:-8000} -e ETCD=$${ETCD:-127.0.0.1:4001} -name deis-controller deis/controller ; exit 0 shell: - docker run -t -i -rm -e ETCD=$${ETCD:-127.0.0.1:4001} deis/server /bin/bash + docker run -t -i -rm -e ETCD=$${ETCD:-127.0.0.1:4001} deis/controller /bin/bash clean: - -docker rmi deis/server + -docker rmi deis/controller flake8: flake8 diff --git a/controller/README.md b/controller/README.md index 4be2ae97aa..3404d76d50 100644 --- a/controller/README.md +++ b/controller/README.md @@ -2,9 +2,9 @@ A Docker image containing a REST API and web server, for use in the [Deis](http://deis.io) open source PaaS. -[![image](https://d207aa93qlcgug.cloudfront.net/img/icons/framed-icon-checked-repository.svg)](https://index.docker.io/u/deis/server/) +[![image](https://d207aa93qlcgug.cloudfront.net/img/icons/framed-icon-checked-repository.svg)](https://index.docker.io/u/deis/controller/) -[**Trusted Build**](https://index.docker.io/u/deis/server/) +[**Trusted Build**](https://index.docker.io/u/deis/controller/) This Docker image is based on the trusted build [deis/base](https://index.docker.io/u/deis/base/), which itself is based on the official [ubuntu:12.04](https://index.docker.io/_/ubuntu/) base image. diff --git a/docs/contributing/localdev.rst b/docs/contributing/localdev.rst index 68ea2e1667..f4bb11c362 100644 --- a/docs/contributing/localdev.rst +++ b/docs/contributing/localdev.rst @@ -153,7 +153,7 @@ For a Local Chef Server For a Hosted Chef Server * Login to the Web UI - * Navigate to the Groups tab + * Navigate to the Groups tab * Click "Edit" on the "Admins" row * Under "Clients" heading, toggle the "deis-controller" radio button * Save changes @@ -247,15 +247,14 @@ Tail Logs .. code-block:: console - $ vagrant ssh -c 'sudo docker logs --follow=true deis-server' - $ vagrant ssh -c 'sudo docker logs --follow=true deis-worker' + $ vagrant ssh -c 'sudo docker logs --follow=true deis-controller' Restart Services ```````````````` .. code-block:: console - $ vagrant ssh -c 'sudo restart deis-worker && sudo restart deis-server' + $ vagrant ssh -c 'sudo restart deis-controller' Django Admin ```````````` diff --git a/docs/contributing/releases.rst b/docs/contributing/releases.rst index 98da6307de..6c6f6afc81 100644 --- a/docs/contributing/releases.rst +++ b/docs/contributing/releases.rst @@ -96,7 +96,7 @@ Documentation * log in to http://pypi.python.org/ and use the web form at the `Deis Pypi`_ page to upload the zipfile - Check documentation for deis/* projects at the `Docker Index`_ - * click "Settings" for each project (deis/server, deis/cache, etc.) + * click "Settings" for each project (deis/controller, deis/cache, etc.) * paste the contents of each README.md into the "long description" field if there are discrepencies. (These don't automatically sync up after the Trusted Build is first created.) diff --git a/docs/cookbook/attributes.rst b/docs/cookbook/attributes.rst index 7f4b68060c..29f9babc2a 100644 --- a/docs/cookbook/attributes.rst +++ b/docs/cookbook/attributes.rst @@ -86,8 +86,8 @@ mode * ``type: Boolean`` When set to true, the cookbook will automatically mount ``default.deis.dev.source``'s -submodules into their respective containers. For example, ``deis-server`` will -automatically have the ``server`` project mounted for development. +submodules into their respective containers. For example, ``deis-logger`` will +automatically have the ``logger`` project mounted for development. source ~~~~~~