x/compass-adapters
Code Issues Proposed changes

Switch to the EOL repo after fedora EOLed grizzly

Browse Source 
Change-Id: I0fab5d2d6bc0f8910f6e2f067b367b31526c3f6e
Closes-bug: #1352453
This commit is contained in:
Jerry Zhao 2014-08-04 10:00:07 -07:00
parent d4b335dedd
commit 6c24eaa1fc
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chef/cookbooks/openstack-common/recipes/databag.rb
View File

@ -66,8 +66,11 @@ end
node.override['openstack']['apt']['components'] = [ "precise-updates/#{node['openstack']['release']}", "main" ] node.override['openstack']['apt']['components'] = [ "precise-updates/#{node['openstack']['release']}", "main" ]
# redhat # redhat
node.override['openstack']['yum']['openstack']['url']="http://repos.fedorapeople.org/repos/openstack/openstack-#{node['openstack']['release']}/epel-#{node['platform_version'].to_i}/" if node['openstack']['release'].eql?("grizzly")
node.override['openstack']['yum']['openstack']['url']="http://repos.fedorapeople.org/repos/openstack/EOL/openstack-#{node['openstack']['release']}/epel-#{node['platform_version'].to_i}/"
else
node.override['openstack']['yum']['openstack']['url']="http://repos.fedorapeople.org/repos/openstack/openstack-#{node['openstack']['release']}/epel-#{node['platform_version'].to_i}/"
end
# Tenant and user # Tenant and user
node.override['openstack']['identity']['admin_token'] = mydata['credential']['identity']['token']['admin'] node.override['openstack']['identity']['admin_token'] = mydata['credential']['identity']['token']['admin']
node.override['openstack']['identity']['tenants'] = ["#{ mydata['credential']['identity']['tenants']['admin']}", "#{ mydata['credential']['identity']['tenants']['service']}"] node.override['openstack']['identity']['tenants'] = ["#{ mydata['credential']['identity']['tenants']['admin']}", "#{ mydata['credential']['identity']['tenants']['service']}"]

6
chef/cookbooks/openstack-common/recipes/environ.rb
View File

@ -31,7 +31,11 @@ node.override['openstack']['release'] = node['release']
node.override['openstack']['apt']['components'] = [ "precise-updates/#{node['openstack']['release']}", "main" ] node.override['openstack']['apt']['components'] = [ "precise-updates/#{node['openstack']['release']}", "main" ]
# redhat # redhat
node.override['openstack']['yum']['openstack']['url']="http://repos.fedorapeople.org/repos/openstack/openstack-#{node['openstack']['release']}/epel-#{node['platform_version'].to_i}/" if node['openstack']['release'].eql?("grizzly")
node.override['openstack']['yum']['openstack']['url']="http://repos.fedorapeople.org/repos/openstack/EOL/openstack-#{node['openstack']['release']}/epel-#{node['platform_version'].to_i}/"
else
node.override['openstack']['yum']['openstack']['url']="http://repos.fedorapeople.org/repos/openstack/openstack-#{node['openstack']['release']}/epel-#{node['platform_version'].to_i}/"
end
# Tenant and user # Tenant and user
node.override['openstack']['identity']['admin_token'] = node['credential']['identity']['token']['admin'] node.override['openstack']['identity']['admin_token'] = node['credential']['identity']['token']['admin']