From 541d6386ecb5dfc9a383544b5982b95b61a69e63 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 7 Dec 2015 13:13:27 -0700 Subject: [PATCH] Drop cephlab_apt-mirror_hack Signed-off-by: Zack Cerza --- roles/cobbler/defaults/main.yml | 1 - roles/cobbler/templates/kickstarts/cephlab_rhel.ks | 1 - roles/cobbler/templates/scripts/cephlab_preseed_late | 1 - roles/cobbler/templates/snippets/cephlab_apt-mirror_hack | 2 -- 4 files changed, 5 deletions(-) delete mode 100755 roles/cobbler/templates/snippets/cephlab_apt-mirror_hack diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml index dd078ba..99a7502 100644 --- 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 5d79e62..0bc417f 100644 --- 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 03c650c..c385655 100644 --- 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 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 -- 2.39.5