Drop cephlab_apt-mirror_hack

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
index dd078ba43910a883aa211911592ee7bb06b39852..99a7502ed6829cc5e4dc037237da8d3938159b98 100644 (file)
--- a/roles/cobbler/defaults/main.yml
+++ b/roles/cobbler/defaults/main.yml
@@ -36,7 +36,6 @@ kickstarts:
 snippets:
   - cephlab_user
   - cephlab_hostname
-  - cephlab_apt-mirror_hack
   - cephlab_packages_rhel
   - cephlab_rc_local
   - cephlab_rhel_disks

diff --git a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
index 5d79e62c8d9d3eff59adec96a0060232d925a946..0bc417fd8ecd50c373229f1742d59f5fd587efe8 100644 (file)
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
@@ -71,7 +71,6 @@ $SNIPPET('post_anamon')
 # Start final steps
 $SNIPPET('cephlab_hostname')
 $SNIPPET('cephlab_user')
-$SNIPPET('cephlab_apt-mirror_hack')
 $SNIPPET('cephlab_rc_local')
 $SNIPPET('kickstart_done')
 # End final steps

diff --git a/roles/cobbler/templates/scripts/cephlab_preseed_late b/roles/cobbler/templates/scripts/cephlab_preseed_late
index 03c650c866bd71e5e6aa4d2817b94b570ba8ec9e..c385655d73b7cfc2c6ba9d4ecba821f04fdb9133 100644 (file)
--- a/roles/cobbler/templates/scripts/cephlab_preseed_late
+++ b/roles/cobbler/templates/scripts/cephlab_preseed_late
@@ -9,7 +9,6 @@ $SNIPPET('download_config_files')
 # custom
 $SNIPPET('cephlab_hostname')
 $SNIPPET('cephlab_user')
-$SNIPPET('cephlab_apt-mirror_hack')
 $SNIPPET('cephlab_rc_local')
 # end custom
 $SNIPPET('kickstart_done')

diff --git a/roles/cobbler/templates/snippets/cephlab_apt-mirror_hack b/roles/cobbler/templates/snippets/cephlab_apt-mirror_hack
deleted file mode 100755 (executable)
index 1239743..0000000
--- a/roles/cobbler/templates/snippets/cephlab_apt-mirror_hack
+++ /dev/null
@@ -1,2 +0,0 @@
-## {{ ansible_managed }}
-grep -q apt-mirror /etc/hosts || echo 64.90.32.37 apt-mirror.front.sepia.ceph.com | sudo tee -a /etc/hosts