diff --git a/packstack/puppet/modules/packstack/lib/facter/has_rdo.rb b/packstack/puppet/modules/packstack/lib/facter/has_rdo.rb deleted file mode 100644 index 407b1f739..000000000 --- a/packstack/puppet/modules/packstack/lib/facter/has_rdo.rb +++ /dev/null @@ -1,5 +0,0 @@ -Facter.add(:has_rdo) do - setcode do - system "ls /etc/yum.repos.d/rdo-release.repo" - end -end diff --git a/packstack/puppet/modules/packstack/manifests/netns.pp b/packstack/puppet/modules/packstack/manifests/netns.pp index b586b2df4..65a19e241 100644 --- a/packstack/puppet/modules/packstack/manifests/netns.pp +++ b/packstack/puppet/modules/packstack/manifests/netns.pp @@ -3,8 +3,6 @@ # and iproute class packstack::netns ( - $rdo_repo_url = 'http://repos.fedorapeople.org/repos/openstack/openstack-grizzly/', - $rdo_rpm_nvr = 'rdo-release-grizzly-3.noarch', $warning = "Kernel package with netns support has been installed." ) { @@ -14,25 +12,6 @@ class packstack::netns ( command => "yum update -y kernel iputils iproute" } - if $::has_rdo != "true" { - stage { 'prepare': - before => Stage['main'], - } - stage { 'cleanup': - require => Stage['main'], - } - - class {'packstack::netns::prepare': - rdo_rpm_url => "${rdo_repo_url}${rdo_rpm_nvr}.rpm", - stage => prepare, - } - - class {'packstack::netns::cleanup': - rdo_rpm_nvr => $rdo_rpm_nvr, - stage => cleanup, - } - } - notify { "packstack_info": message => $warning, require => Exec["netns_dependecy_install"], diff --git a/packstack/puppet/modules/packstack/manifests/netns/cleanup.pp b/packstack/puppet/modules/packstack/manifests/netns/cleanup.pp deleted file mode 100644 index 1e55db04a..000000000 --- a/packstack/puppet/modules/packstack/manifests/netns/cleanup.pp +++ /dev/null @@ -1,9 +0,0 @@ - -class packstack::netns::cleanup ( - $rdo_rpm_nvr = 'rdo-release-grizzly-3.noarch' -) { - exec { "rdo_repo_uninstall": - path => "/usr/bin/", - command => "yum remove -y $rdo_rpm_nvr", - } -} diff --git a/packstack/puppet/modules/packstack/manifests/netns/prepare.pp b/packstack/puppet/modules/packstack/manifests/netns/prepare.pp deleted file mode 100644 index 9373e74a6..000000000 --- a/packstack/puppet/modules/packstack/manifests/netns/prepare.pp +++ /dev/null @@ -1,9 +0,0 @@ - -class packstack::netns::prepare ( - $rdo_rpm_url = 'http://repos.fedorapeople.org/repos/openstack/openstack-grizzly/rdo-release-grizzly-3.noarch' -){ - exec { "rdo_repo_install": - path => "/usr/bin/", - command => "yum localinstall -y $rdo_rpm_url", - } -}