From 9ce1d8ef2710ff4fc7de11d87282ebe7cc03477b Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Thu, 27 Aug 2015 15:24:36 -0500 Subject: [PATCH] Initial Liberty Changes Metadata changes - Updated maintainer email - Updated the version Attributes changes - Changed some comments for liberty rubocop updates remove db2 refs Change-Id: Ic318239294fa32173634c68710fb93e1b09d3e42 --- README.md | 2 -- attributes/default.rb | 16 ++++++++-------- metadata.rb | 14 +++++++------- recipes/libvirt.rb | 3 ++- spec/nova-common-redhat_spec.rb | 7 ------- spec/nova-common_spec.rb | 2 +- 6 files changed, 18 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index e05082db..37b905d6 100644 --- a/README.md +++ b/README.md @@ -152,8 +152,6 @@ Openstack Compute attributes are in the attribute namespace ["openstack"]["compu * `openstack["compute"]["rpc_thread_pool_size"]` - Size of RPC thread pool (default 64) * `openstack["compute"]["rpc_conn_pool_size"]` - Size of RPC connection pool (default 30) * `openstack["compute"]["rpc_response_timeout"]` - Seconds to wait for a response from call or multicall (default 60) -TODO: Add DB2 support on other platforms -* `openstack["compute"]["platform"]["db2_python_packages"]` - Array of DB2 python packages, only available on redhat platform * `openstack['compute']['api']['auth']['version']` - Select v2.0 or v3.0. Default v2.0. The auth API version used to interact with identity service. * `openstack['compute']['api']['auth']['memcached_servers']` - A list of memcached server(s) for caching * `openstack['compute']['api']['auth']['memcache_security_strategy']` - Whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. diff --git a/attributes/default.rb b/attributes/default.rb index de78b12b..87da26dd 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -680,16 +680,16 @@ end # but release name alias are also supported. # options e.g.: # default['openstack']['compute']['upgrade_levels'] = { -# 'baseapi' => 'kilo', -# 'console' => 'kilo', -# 'consoleauth' => 'kilo', -# 'cert' => 'kilo', -# 'scheduler' => 'kilo', -# 'compute' => 'kilo', -# 'intercell' => 'kilo', +# 'baseapi' => 'liberty', +# 'console' => 'liberty', +# 'consoleauth' => 'liberty', +# 'cert' => 'liberty', +# 'scheduler' => 'liberty', +# 'compute' => 'liberty', +# 'intercell' => 'liberty', # 'conductor' => '2.0', # 'network' => '3.0', -# 'cells' => 'kilo' +# 'cells' => 'liberty' # } # choose the needed ones to set default['openstack']['compute']['upgrade_levels'] = nil diff --git a/metadata.rb b/metadata.rb index fc1efe56..9dc21282 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,10 +1,10 @@ name 'openstack-compute' maintainer 'openstack-chef' -maintainer_email 'opscode-chef-openstack@googlegroups.com' +maintainer_email 'openstack-dev@lists.openstack.org' license 'Apache 2.0' description 'The OpenStack Compute service Nova.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '11.1.0' +version '12.0.0' recipe 'openstack-compute::api-ec2', 'Installs AWS EC2 compatible API' recipe 'openstack-compute::api-metadata', 'Installs the nova metadata package' @@ -28,10 +28,10 @@ recipe 'openstack-compute::serialproxy', 'Installs and configures the serialprox end depends 'ceph', '~> 0.8.0' -depends 'openstack-bare-metal', '>= 11.0.0' -depends 'openstack-common', '>= 11.5.0' -depends 'openstack-identity', '>= 11.0.0' -depends 'openstack-image', '>= 11.0.0' -depends 'openstack-network', '>= 11.0.0' +depends 'openstack-bare-metal', '>= 12.0.0' +depends 'openstack-common', '>= 12.0.0' +depends 'openstack-identity', '>= 12.0.0' +depends 'openstack-image', '>= 12.0.0' +depends 'openstack-network', '>= 12.0.0' depends 'selinux', '~> 0.9.0' depends 'python', '~> 1.4.6' diff --git a/recipes/libvirt.rb b/recipes/libvirt.rb index 7872f9ff..a72c2e74 100644 --- a/recipes/libvirt.rb +++ b/recipes/libvirt.rb @@ -31,7 +31,8 @@ platform_options['libvirt_packages'].each do |pkg| end def update_grub_default_kernel(flavor = 'default') # rubocop:disable MethodLength - default_boot, current_default = 0, nil + default_boot = 0 + current_default = nil # parse menu.lst, to find boot index for selected flavor File.open('/boot/grub/menu.lst') do |f| diff --git a/spec/nova-common-redhat_spec.rb b/spec/nova-common-redhat_spec.rb index 4095b762..d0b5acc7 100644 --- a/spec/nova-common-redhat_spec.rb +++ b/spec/nova-common-redhat_spec.rb @@ -20,13 +20,6 @@ describe 'openstack-compute::nova-common' do expect(chef_run).to upgrade_package 'MySQL-python' end - it 'upgrades db2 python packages if explicitly told' do - node.set['openstack']['db']['compute']['service_type'] = 'db2' - ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg| - expect(chef_run).to upgrade_package pkg - end - end - it 'upgrades memcache python packages' do expect(chef_run).to upgrade_package 'python-memcached' end diff --git a/spec/nova-common_spec.rb b/spec/nova-common_spec.rb index f35e73d4..6f12035c 100644 --- a/spec/nova-common_spec.rb +++ b/spec/nova-common_spec.rb @@ -426,7 +426,7 @@ describe 'openstack-compute::nova-common' do [/^amqp_durable_queues=false$/, /^amqp_auto_delete=false$/, /^heartbeat_timeout_threshold=0$/, /^heartbeat_rate=2$/, /^rabbit_userid=guest$/, /^rabbit_password=mq-pass$/, - /^rabbit_virtual_host=\/$/, /^rabbit_host=127.0.0.1$/, + %r{^rabbit_virtual_host=/$}, /^rabbit_host=127.0.0.1$/, /^rabbit_max_retries=0$/, /^rabbit_retry_interval=1$/, /^rabbit_port=5672$/].each do |line| expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)