Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/328299 )
Change subject: Nova: Fix some deprecated settings in nova.conf ...................................................................... Nova: Fix some deprecated settings in nova.conf Change-Id: Ib621ed43c5d8297362bfecd95845213f1341a268 --- M modules/openstack/templates/liberty/nova/nova.conf.erb M modules/openstack/templates/mitaka/nova/nova.conf.erb 2 files changed, 20 insertions(+), 21 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/liberty/nova/nova.conf.erb b/modules/openstack/templates/liberty/nova/nova.conf.erb index a84cafb..cfe349f 100644 --- a/modules/openstack/templates/liberty/nova/nova.conf.erb +++ b/modules/openstack/templates/liberty/nova/nova.conf.erb @@ -24,8 +24,6 @@ my_ip=<%= @novaconfig["my_ip"] %> log_dir=/var/log/nova state_path=/var/lib/nova -lock_path=/var/lock/nova -sql_connection=mysql://<%= @novaconfig["db_user"] %>:<%= @novaconfig["db_pass"] %>@<%= @novaconfig["db_host"] %>/<%= @novaconfig["db_name"] %> image_service=nova.image.glance.GlanceImageService remove_unused_base_images=True s3_host=<%= @novaconfig["glance_host"] %> @@ -71,9 +69,6 @@ routing_source_ip=<%= @novaconfig["network_public_ip"] %> multi_host=False -# novnc stuff -vnc_enabled=False - dnsmasq_config_file=/etc/dnsmasq-nova.conf # Settings for wikistatus, the plugin that updates OSM with instance status: @@ -114,6 +109,7 @@ [database] # http://docs.sqlalchemy.org/en/latest/core/pooling.html +connection=mysql://<%= @novaconfig["db_user"] %>:<%= @novaconfig["db_pass"] %>@<%= @novaconfig["db_host"] %>/<%= @novaconfig["db_name"] %> max_overflow = 25 max_pool_size = 10 pool_timeout = 60 @@ -138,6 +134,12 @@ rabbit_userid = <%= @novaconfig["rabbit_user"] %> rabbit_password = <%= @novaconfig["rabbit_pass"] %> +[oslo_concurrency] +lock_path=/var/lock/nova + +[vnc] +enabled=False + [spice] html5proxy_host=<%= @novaconfig['controller_hostname'] %> html5proxy_port=6082 @@ -155,9 +157,3 @@ # Keymap for spice (string value) keymap=en-us - -[workarounds] -# This is the safest option until evacuation is fixed in Libery -destroy_after_evacuate=False - - diff --git a/modules/openstack/templates/mitaka/nova/nova.conf.erb b/modules/openstack/templates/mitaka/nova/nova.conf.erb index 71c3a16..fb0c14a 100644 --- a/modules/openstack/templates/mitaka/nova/nova.conf.erb +++ b/modules/openstack/templates/mitaka/nova/nova.conf.erb @@ -24,8 +24,6 @@ my_ip=<%= @novaconfig["my_ip"] %> log_dir=/var/log/nova state_path=/var/lib/nova -lock_path=/var/lock/nova -sql_connection=mysql://<%= @novaconfig["db_user"] %>:<%= @novaconfig["db_pass"] %>@<%= @novaconfig["db_host"] %>/<%= @novaconfig["db_name"] %> image_service=nova.image.glance.GlanceImageService remove_unused_base_images=True s3_host=<%= @novaconfig["glance_host"] %> @@ -70,9 +68,6 @@ routing_source_ip=<%= @novaconfig["network_public_ip"] %> multi_host=False -# novnc stuff -vnc_enabled=False - dnsmasq_config_file=/etc/dnsmasq-nova.conf # Settings for wikistatus, the plugin that updates OSM with instance status: @@ -111,6 +106,13 @@ # Should be: #default_availability_zone = <%= @novaconfig["zone"] %> +[database] +# http://docs.sqlalchemy.org/en/latest/core/pooling.html +connection=mysql://<%= @novaconfig["db_user"] %>:<%= @novaconfig["db_pass"] %>@<%= @novaconfig["db_host"] %>/<%= @novaconfig["db_name"] %> +max_overflow = 25 +max_pool_size = 10 +pool_timeout = 60 + [glance] host=<%= @novaconfig["glance_host"] %> @@ -131,6 +133,12 @@ rabbit_userid = <%= @novaconfig["rabbit_user"] %> rabbit_password = <%= @novaconfig["rabbit_pass"] %> +[oslo_concurrency] +lock_path=/var/lock/nova + +[vnc] +enabled=False + [spice] html5proxy_host=<%= @novaconfig['controller_hostname'] %> html5proxy_port=6082 @@ -148,11 +156,6 @@ # Keymap for spice (string value) keymap=en-us - -[workarounds] -# This is the safest option until evacuation is fixed in Libery -destroy_after_evacuate=False - [api_database] connection=mysql://<%= @novaconfig["db_user"] %>:<%= @novaconfig["db_pass"] %>@<%= @novaconfig["db_host"] %>/<%= @novaconfig["api_db_name"] %> -- To view, visit https://gerrit.wikimedia.org/r/328299 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib621ed43c5d8297362bfecd95845213f1341a268 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
