From 8ea55bbdbee7907a6f20e441e31dec759b053a40 Mon Sep 17 00:00:00 2001
From: Miroslav-Anashkin <manashkin@mirantis.com>
Date: Fri, 17 May 2013 22:26:24 +0400
Subject: [PATCH] Added mirantis-epel-fuel to centos kickstart in cobbler

---
 .../cobbler/manifests/distro/centos63_x86_64.pp |  2 +-
 .../manifests/profile/centos63_x86_64.pp        |  4 ++++
 iso/bootstrap_admin_node.sh                     | 17 ++++++++++++-----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/deployment/puppet/cobbler/manifests/distro/centos63_x86_64.pp b/deployment/puppet/cobbler/manifests/distro/centos63_x86_64.pp
index ccd0dea51c..ac320f1210 100644
--- a/deployment/puppet/cobbler/manifests/distro/centos63_x86_64.pp
+++ b/deployment/puppet/cobbler/manifests/distro/centos63_x86_64.pp
@@ -15,7 +15,7 @@
 
 class cobbler::distro::centos63_x86_64(
   $http_iso = 'http://download.mirantis.com/epel-fuel-folsom-2.1/CentOS-6.3-x86_64-minimal.iso',
-  $ks_url   = 'http://download.mirantis.com/epel-fuel-folsom-2.1/mirror.external.list'
+  $ks_url   = 'http://download.mirantis.com/epel-fuel-folsom-2.1'
   ) {
 
   Exec {path => '/usr/bin:/bin:/usr/sbin:/sbin'}
diff --git a/deployment/puppet/cobbler/manifests/profile/centos63_x86_64.pp b/deployment/puppet/cobbler/manifests/profile/centos63_x86_64.pp
index a2e1470599..0932a581ab 100644
--- a/deployment/puppet/cobbler/manifests/profile/centos63_x86_64.pp
+++ b/deployment/puppet/cobbler/manifests/profile/centos63_x86_64.pp
@@ -29,6 +29,10 @@ class cobbler::profile::centos63_x86_64(
               {
               "name" => "Mirantis-CentOS-minimal",
               "url"  => "http://download.mirantis.com/centos-minimal",
+              },
+              {
+              "name" => "Mirantis-epel-fuel-install",
+              "url"  => "http://download.mirantis.com/epel-fuel-folsom-2.1",
               }
               ],
 
diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
index 1f111be8a2..cdb9dd583e 100644
--- a/iso/bootstrap_admin_node.sh
+++ b/iso/bootstrap_admin_node.sh
@@ -99,14 +99,21 @@ puppet apply -e '
     } '
 
 # Configuring squid with or without parent proxy
-[ -n "$parent_proxy" ] && IFS=: read server port <<< "$parent_proxy"
-puppet apply -e "
-\$squid_cache_parent = \"$server\"
-\$squid_cache_parent_port = \"$port\"
-class { squid: }"
+if [[ -n "$parent_proxy" ]];then
+  IFS=: read server port <<< "$parent_proxy"
+  puppet apply -e "
+  \$squid_cache_parent = \"$server\"
+  \$squid_cache_parent_port = \"$port\"
+  class { squid: }"
+else
+  puppet apply -e "class { squid: }"
+fi
 
 iptables -A PREROUTING -t nat -i $mgmt_if -s $mgmt_ip/$mgmt_mask ! -d $mgmt_ip -p tcp --dport 80 -j REDIRECT --to-port 3128
 
+/etc/init.d/iptables save
+
+
 gem install /var/www/astute-0.0.1.gem
 
 cp `find / -name config.yaml -print0 | grep -FzZ 'samples/config.yaml'` /root