diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls --- a/pillar/nodes/nodes.sls +++ b/pillar/nodes/nodes.sls @@ -57,17 +57,6 @@ ipv6_tunnel: False - equatower: - forest: nasqueron-infra - hostname: equatower.nasqueron.org - roles: - - paas-docker - network: - ipv4_address: 51.255.124.10 - ipv4_gateway: 91.121.86.254 - - ipv6_tunnel: True - router-001: forest: nasqueron-infra hostname: router-001.nasqueron.org diff --git a/pillar/top.sls b/pillar/top.sls --- a/pillar/top.sls +++ b/pillar/top.sls @@ -37,13 +37,6 @@ eglide: - shellserver.quassel - equatower: - - credentials.zr - - paas.docker - - saas.jenkins - - saas.phpbb - - saas.sentry - ysul: - devserver.repos - credentials.zr diff --git a/roles/devserver/userland-home/files/dereckson/bin/deploy-container b/roles/devserver/userland-home/files/dereckson/bin/deploy-container --- a/roles/devserver/userland-home/files/dereckson/bin/deploy-container +++ b/roles/devserver/userland-home/files/dereckson/bin/deploy-container @@ -7,7 +7,7 @@ SALT_OPS_REPO=/opt/salt/nasqueron-operations SALT="salt-wrapper salt" -PAAS_DOCKER_SERVER="equatower" +PAAS_DOCKER_SERVER="docker-001" CONTAINER=$1 CONTAINER_SLS="$SALT_OPS_REPO/roles/paas-docker/containers/$CONTAINER.sls" diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf --- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf +++ b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf @@ -41,7 +41,7 @@ } location /datasources { - proxy_pass http://equatower.nasqueron.org:19080; + proxy_pass http://docker-001.nasqueron.org:19080; include includes/proxy; include includes/cors-open; } @@ -71,7 +71,7 @@ } location /docker/registry { - proxy_pass http://equatower.nasqueron.org:20080/; + proxy_pass http://docker-001.nasqueron.org:20080/; include includes/proxy; include includes/cors-open; } diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf --- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf +++ b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf @@ -53,7 +53,7 @@ location /cd/dashboard { rewrite ^/cd/dashboard/?(.*)$ /$1 break; - proxy_pass http://equatower.nasqueron.org:24180; + proxy_pass http://docker-001.nasqueron.org:24180; include includes/proxy; } } diff --git a/top.sls b/top.sls --- a/top.sls +++ b/top.sls @@ -37,5 +37,3 @@ 'eglide': - roles/webserver-core - roles/shellserver - 'equatower': - - roles/paas-docker