Skip to content

Commit 6002543

Browse files
committed
Remove references to legacy SMS Test Pulp (pulp-server)
1 parent 764f5dc commit 6002543

File tree

5 files changed

+0
-38
lines changed

5 files changed

+0
-38
lines changed

doc/source/contributor/environments/aufn-ceph.rst

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ Ubuntu:
4343
sudo apt -y install gcc libffi-dev python3-dev python-is-python3
4444
4545
46-
As a workaround for SMS lab's lack of DNS, add the following lines to ``/etc/hosts`` of the baremetal node:
47-
48-
.. parsed-literal::
49-
50-
10.0.0.34 pelican pelican.service.compute.sms-lab.cloud
51-
10.205.3.187 pulp-server pulp-server.internal.sms-cloud
52-
5346
Configure the system firewall and security settings:
5447

5548
.. parsed-literal::
@@ -124,14 +117,6 @@ Once the seed vm is provisioned, deploy a local pulp server on the seed and then
124117
kayobe seed service deploy --tags seed-deploy-containers --kolla-tags none
125118
$KAYOBE_CONFIG_PATH/environments/aufn-ceph/configure-local-networking.sh
126119
127-
Once the local pulp server is deployed, we need to add the address of SMS lab test pulp to the local pulp container:
128-
129-
.. parsed-literal::
130-
131-
132-
docker exec pulp sh -c 'echo "10.205.3.187 pulp-server pulp-server.internal.sms-cloud" | tee -a /etc/hosts'
133-
exit
134-
135120
We can now sync the contents of the local pulp server with that of SMS test pulp and then complete the seed VM setup:
136121

137122
.. parsed-literal::

etc/kayobe/ansible/fix-networking.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
path: /etc/hosts
1919
marker: "# {mark} Kayobe entries"
2020
block: |
21-
10.0.0.34 pelican pelican.service.compute.sms-lab.cloud
22-
10.205.3.187 pulp-server pulp-server.internal.sms-cloud
2321
192.168.37.2 internal.infra.mos.{{ root_domain }}
2422
192.168.39.2 public.infra.mos.{{ root_domain }}
2523
become: true

etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,6 @@ KAYOBE_BRANCH=stackhpc/2024.1
1414
KAYOBE_CONFIG_BRANCH=stackhpc/2024.1
1515
KAYOBE_ENVIRONMENT=aufn-ceph
1616

17-
PELICAN_HOST="10.0.0.34 pelican pelican.service.compute.sms-lab.cloud"
18-
PULP_HOST="10.205.3.187 pulp-server pulp-server.internal.sms-cloud"
19-
20-
# FIXME: Work around lack of DNS on SMS lab.
21-
cat << EOF | sudo tee -a /etc/hosts
22-
$PELICAN_HOST
23-
$PULP_HOST
24-
EOF
25-
2617
# Install git and tmux.
2718
if $(which dnf 2>/dev/null >/dev/null); then
2819
sudo dnf -y install git tmux
@@ -92,11 +83,6 @@ kayobe seed service deploy --tags seed-deploy-containers --kolla-tags none
9283
# Deploying the seed restarts networking interface, run configure-local-networking.sh again to re-add routes.
9384
$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/configure-local-networking.sh
9485

95-
# Add sms lab test pulp to /etc/hosts of seed vm's pulp container
96-
SEED_IP=192.168.33.5
97-
REMOTE_COMMAND="docker exec pulp sh -c 'echo $PULP_HOST | tee -a /etc/hosts'"
98-
ssh stack@$SEED_IP $REMOTE_COMMAND
99-
10086
# Sync package & container repositories.
10187
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/pulp-repo-sync.yml
10288
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/pulp-repo-publish.yml

etc/kayobe/stackhpc-overcloud-dib.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ stackhpc_overcloud_dib_env_vars:
4747
# sometimes).
4848
# DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_focal_url if os_distribution == 'ubuntu' else '' }}"
4949
DIB_DRACUT_ENABLED_MODULES_DEFAULT_CONFIG: "{{ stackhpc_overcloud_dib_dracut_enabled_modules_default_config }}"
50-
# FIXME: Workaround for lack of internal DNS on SMS lab.
51-
DIB_ETC_HOSTS_EXTRA: |
52-
10.205.3.187 pulp-server pulp-server.internal.sms-cloud
5350
DIB_RELEASE: "{{ overcloud_dib_os_release }}"
5451
DIB_SUDOERS_FILENAME: "no-fqdn"
5552
# Avoid DNS queries during sudo commands, since we might not always have working DNS.

terraform/aio/templates/userdata.cfg.tpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
# Don't automatically mount ephemeral disk
33
mounts:
44
- [/dev/vdb, null]
5-
# WORKAROUND: internal DNS missing from SMS lab.
6-
runcmd:
7-
- 'echo "10.0.0.34 pelican pelican.service.compute.sms-lab.cloud" >> /etc/hosts'
8-
- 'echo "10.205.3.187 pulp-server pulp-server.internal.sms-cloud" >> /etc/hosts'
95
# Configure SSH keys here, to avoid creating an ephemeral keypair.
106
# This means only the instance needs to be cleaned up if the destroy fails.
117
ssh_authorized_keys:

0 commit comments

Comments
 (0)