Don't install RDO repo
Change-Id: Id601aa4a7dc8cbffe920a1027f06e64e13d220b7
This commit is contained in:
		| @@ -1,5 +0,0 @@ | ||||
| Facter.add(:has_rdo) do | ||||
|   setcode do | ||||
|     system "ls /etc/yum.repos.d/rdo-release.repo" | ||||
|   end | ||||
| end | ||||
| @@ -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"], | ||||
|   | ||||
| @@ -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", | ||||
|     } | ||||
| } | ||||
| @@ -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", | ||||
|     } | ||||
| } | ||||
		Reference in New Issue
	
	Block a user
	 Martin Magr
					Martin Magr