Page MenuHomeDevCentral
Files F3781475

D2851.diff
No OneTemporary
Actions

D2851.diff
View Options

diff --git a/pillar/credentials/zr.sls b/pillar/credentials/zr.sls
--- a/pillar/credentials/zr.sls
+++ b/pillar/credentials/zr.sls
@@ -120,9 +120,3 @@
- cloudhugger.nasqueron.org
restrictCommand:
comment: Zemke-Rhyne
-
- - key: 152
- allowedConnectionFrom:
- - docker-001.nasqueron.org
- restrictCommand:
- comment: Zemke-Rhyne
diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
--- a/pillar/nodes/nodes.sls
+++ b/pillar/nodes/nodes.sls
@@ -110,34 +110,6 @@
netmask: *intranought_netmask
gateway: 172.27.27.1
- docker-001:
- forest: nasqueron-infra
- hostname: docker-001.nasqueron.org
- roles:
- - paas-docker
- - paas-docker-prod
- network:
- ipv6_tunnel: False
-
- canonical_public_ipv4: 51.255.124.9
-
- interfaces:
- public:
- device: ens192
- uuid: ef7370c5-5060-4d89-82bb-dbeabf4a35f6
- ipv4:
- address: 51.255.124.9
- netmask: *intranought_netmask
- gateway: 51.210.99.254
-
- intranought:
- device: ens224
- uuid: 3fd0b9f8-ecc3-400d-bc61-3ba21d0b6337
- ipv4:
- address: 172.27.27.6
- netmask: *intranought_netmask
- gateway: 172.27.27.1
-
docker-002:
forest: nasqueron-infra
hostname: docker-002.nasqueron.org
diff --git a/roles/core/motd/files/docker-001 b/roles/core/motd/files/docker-001
deleted file mode 100644
--- a/roles/core/motd/files/docker-001
+++ /dev/null
@@ -1,14 +0,0 @@
-
- docker-001 ______
- \ \
- A Nasqueron infra- \ \ IP: {{ ipv4_address }}
- structure server. \ \_ GW: {{ ipv4_gateway }}
- _\ \
- PaaS Docker \ \
- \ \_
- The containers hosted _\ \
- here are in production. \ \
- \ \_
- /// /// /// /// /// /// _\ \
- \ \
-___________________________________\ \_________mic'03
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="docker-001"
+PAAS_DOCKER_SERVER="docker-002"
CONTAINER=$1
CONTAINER_SLS="$SALT_OPS_REPO/roles/paas-docker/containers/$CONTAINER.sls"

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 20:24 (22 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2265065
Default Alt Text
D2851.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator