openstack/openstack-ansible
Code Issues Proposed changes

Enable fatal_deprecations configuration per OpenStack service

Browse Source 
Introduced namespaced variables for all OpenStack services supporting
this setting as defined through oslo libraries. Default value is False
in each case. Gating commit checks now enable the fatal_deprecations
setting for each supporting service.

Closes Bug: 1428412
Change-Id: I5f41d3fdfa1cc876efc0c33c657c9dad18a8ba51
This commit is contained in:
Steve Lewis 2015-03-16 19:39:20 -05:00
parent ad42b1713b
commit ee78b91e81
17 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/os_cinder/defaults/main.yml
View File

@ -24,6 +24,8 @@ cinder_storage_address: 127.0.0.1
cinder_nova_catalog_info: compute:nova:internalURL
cinder_nova_catalog_admin_info: compute:nova:adminURL
cinder_fatal_deprecations: False
## DB
cinder_galera_user: cinder
cinder_galera_database: cinder

1
playbooks/roles/os_cinder/templates/cinder.conf.j2
View File

@ -6,6 +6,7 @@
[DEFAULT]
verbose = {{ verbose }}
debug = {{ debug }}
fatal_deprecations = {{ cinder_fatal_deprecations }}
my_ip = {{ cinder_storage_address }}
osapi_volume_workers = {{ cinder_osapi_volume_workers | default(api_threads) }}

1
playbooks/roles/os_glance/defaults/main.yml
View File

@ -19,6 +19,7 @@ is_metal: true
## Verbosity Options
debug: False
verbose: True
glance_fatal_deprecations: False
## System info
glance_system_user_name: glance

1
playbooks/roles/os_glance/templates/glance-api.conf.j2
View File

@ -7,6 +7,7 @@
verbose = {{ verbose }}
debug = {{ debug }}
log_file = /var/log/glance/glance-api.log
fatal_deprecations = {{ glance_fatal_deprecations }}
use_syslog = False
bind_host = {{ glance_api_bind_address }}
bind_port = {{ glance_api_service_port }}

1
playbooks/roles/os_glance/templates/glance-registry.conf.j2
View File

@ -6,6 +6,7 @@
[DEFAULT]
verbose = {{ verbose }}
debug = {{ debug }}
fatal_deprecations = {{ glance_fatal_deprecations }}
log_file = /var/log/glance/glance-registry.log
use_syslog = False
bind_host = {{ glance_registry_bind_address }}

1
playbooks/roles/os_heat/defaults/main.yml
View File

@ -22,6 +22,7 @@ is_metal: true
## Verbosity Options
debug: False
verbose: True
heat_fatal_deprecations: False
heat_client_endpoint: internalURL

1
playbooks/roles/os_heat/templates/heat.conf.j2
View File

@ -3,6 +3,7 @@
[DEFAULT]
verbose = {{ verbose }}
debug = {{ debug }}
fatal_deprecations = {{ heat_fatal_deprecations }}
use_syslog = False
log_file = /var/log/heat/heat.log

1
playbooks/roles/os_keystone/defaults/main.yml
View File

@ -19,6 +19,7 @@ is_metal: true
## Verbosity Options
debug: False
verbose: True
keystone_fatal_deprecations: False
## System info
keystone_system_user_name: keystone

1
playbooks/roles/os_keystone/templates/keystone.conf.j2
View File

@ -11,6 +11,7 @@ public_endpoint = {{ keystone_public_endpoint }}
{% endif %}
admin_port = {{ keystone_admin_port }}
admin_endpoint = {{ keystone_service_adminuri }}
fatal_deprecations = {{ keystone_fatal_deprecations }}
log_file = keystone.log
log_dir = /var/log/keystone

1
playbooks/roles/os_neutron/defaults/main.yml
View File

@ -19,6 +19,7 @@ is_metal: true
## Verbosity Options
debug: False
verbose: True
neutron_fatal_deprecations: False
## neutron User / Group
neutron_system_user_name: neutron

1
playbooks/roles/os_neutron/templates/neutron.conf.j2
View File

@ -8,6 +8,7 @@
[DEFAULT]
verbose = {{ verbose }}
debug = {{ debug }}
fatal_deprecations = {{ neutron_fatal_deprecations }}
use_syslog = False

1
playbooks/roles/os_nova/defaults/main.yml
View File

@ -19,6 +19,7 @@ is_metal: true
## Verbosity Options
debug: False
verbose: True
nova_fatal_deprecations: False
## System info
nova_system_user_name: nova

1
playbooks/roles/os_nova/templates/nova.conf.j2
View File

@ -7,6 +7,7 @@
# Logs / State
debug = {{ debug }}
verbose = {{ verbose }}
fatal_deprecations = {{ nova_fatal_deprecations }}
log_dir = /var/log/nova
state_path = {{ nova_system_home_folder }}
lock_path = /var/lock/nova

1
playbooks/roles/os_tempest/defaults/main.yml
View File

@ -19,6 +19,7 @@ is_metal: true
## Verbosity Options
debug: False
verbose: True
tempest_fatal_deprecations: False
tempest_private_subnet_cidr: "192.168.74.0/24"
tempest_public_subnet_cidr: "10.1.13.0/24"

1
playbooks/roles/os_tempest/templates/tempest.conf.j2
View File

@ -5,6 +5,7 @@ disable_process_locking = false
lock_path = {{ tempest_git_dest }}/locks
debug = {{ debug }}
verbose = {{ verbose }}
fatal_deprecations = {{ tempest_fatal_deprecations }}
log_file = /var/log/utility/tempest.log
use_stderr = False
fatal_deprecations = true

38
scripts/bootstrap-aio.sh
View File

@ -29,6 +29,15 @@ export NOVA_VIRT_TYPE=${NOVA_VIRT_TYPE:-"qemu"}
export TEMPEST_FLAT_CIDR=${TEMPEST_FLAT_CIDR:-"172.29.248.0/22"}
export FLUSH_IPTABLES=${FLUSH_IPTABLES:-"yes"}
# Default disabled fatal deprecation warnings
export CINDER_FATAL_DEPRECATIONS=${CINDER_FATAL_DEPRECATIONS:-"no"}
export GLANCE_FATAL_DEPRECATIONS=${GLANCE_FATAL_DEPRECATIONS:-"no"}
export HEAT_FATAL_DEPRECATIONS=${HEAT_FATAL_DEPRECATIONS:-"no"}
export KEYSTONE_FATAL_DEPRECATIONS=${KEYSTONE_FATAL_DEPRECATIONS:-"no"}
export NEUTRON_FATAL_DEPRECATIONS=${NEUTRON_FATAL_DEPRECATIONS:-"no"}
export NOVA_FATAL_DEPRECATIONS=${NOVA_FATAL_DEPRECATIONS:-"no"}
export TEMPEST_FATAL_DEPRECATIONS=${TEMPEST_FATAL_DEPRECATIONS:-"no"}
## Library Check -------------------------------------------------------------
info_block "Checking for required libraries." 2> /dev/null || source $(dirname ${0})/scripts-library.sh
@ -267,6 +276,35 @@ if [ "${DEPLOY_SWIFT}" == "yes" ]; then
sed -i "s/glance_swift_store_user:.*/glance_swift_store_user: '{{ keystone_admin_user_name }}:{{ keystone_admin_tenant_name }}'/" /etc/openstack_deploy/user_secrets.yml
fi
# Update fatal_deprecations settings
if [ "${CINDER_FATAL_DEPRECATIONS}" == "yes" ]; then
echo "cinder_fatal_deprecations: True" | tee -a /etc/openstack_deploy/user_variables.yml
fi
if [ "${GLANCE_FATAL_DEPRECATIONS}" == "yes" ]; then
echo "glance_fatal_deprecations: True" | tee -a /etc/openstack_deploy/user_variables.yml
fi
if [ "${HEAT_FATAL_DEPRECATIONS}" == "yes" ]; then
echo "heat_fatal_deprecations: True" | tee -a /etc/openstack_deploy/user_variables.yml
fi
if [ "${KEYSTONE_FATAL_DEPRECATIONS}" == "yes" ]; then
echo "keystone_fatal_deprecations: True" | tee -a /etc/openstack_deploy/user_variables.yml
fi
if [ "${NEUTRON_FATAL_DEPRECATIONS}" == "yes" ]; then
echo "neutron_fatal_deprecations: True" | tee -a /etc/openstack_deploy/user_variables.yml
fi
if [ "${NOVA_FATAL_DEPRECATIONS}" == "yes" ]; then
echo "nova_fatal_deprecations: True" | tee -a /etc/openstack_deploy/user_variables.yml
fi
if [ "${TEMPEST_FATAL_DEPRECATIONS}" == "yes" ]; then
echo "tempest_fatal_deprecations: True" | tee -a /etc/openstack_deploy/user_variables.yml
fi
# Log some data about the instance and the rest of the system
log_instance_info

8
scripts/gate-check-commit.sh
View File

@ -43,6 +43,14 @@ export SYMLINK_DIR=${SYMLINK_DIR:-"$(pwd)/logs"}
export RUN_TEMPEST_OPTS=${RUN_TEMPEST_OPTS:-'--serial'}
export TESTR_OPTS=${TESTR_OPTS:-''}
# enable fatal deprecation warnings
export CINDER_FATAL_DEPRECATIONS=yes
export GLANCE_FATAL_DEPRECATIONS=yes
export HEAT_FATAL_DEPRECATIONS=yes
export KEYSTONE_FATAL_DEPRECATIONS=yes
export NEUTRON_FATAL_DEPRECATIONS=yes
export NOVA_FATAL_DEPRECATIONS=yes
export TEMPEST_FATAL_DEPRECATIONS=yes
## Functions -----------------------------------------------------------------
info_block "Checking for required libraries." 2> /dev/null || source $(dirname ${0})/scripts-library.sh