nova controller doesn't set notification driver for ceilometer

[Andrew Woodward]

https://github.com/openstack/fuel-library/blob/master/deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp#L168

uses nova_hash to set the $nova_notification_driver, but it doesn't contain this key, so its else case ( [] ) is always used, however ceilometer_hash has this key, and we should use with ceilometer enabled installs.

# (abubyr) Fix notification options specification in controller's nova.conf
# This will allow to pass compute.instance.update events from Nova to Ceilometer
# 1) nova_hash does not contain key 'notification_driver' so we switched to 'ceilometer' hash
# 2) option notify_on_state_change was previously not specified at all
if $ceilometer_hash['enabled'] {
  if $ceilometer_hash['notification_driver'] {
    $nova_notification_driver = $ceilometer_hash['notification_driver']
  } else {
    $nova_notification_driver = []
  }
  $nova_notify_on_state_change = 'vm_and_task_state'
} else {
    $nova_notification_driver = []
    $nova_notify_on_state_change = undef

[Bug Checker Bot (bug-checker)]

(This check performed automatically)
Please, make sure that bug description contains the following sections filled in with the appropriate data related to the bug you are describing:

actual result

version

expected result

steps to reproduce

For more detailed information on the contents of each of the listed sections see https://wiki.openstack.org/wiki/Fuel/How_to_contribute#Here_is_how_you_file_a_bug

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/301897

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/301897
Committed: https://git.openstack.org/cgit/openstack/fuel-library/commit/?id=b011c1d6bbe574ea64e3c91f580f7ea7a45cc967
Submitter: Jenkins
Branch: master

commit b011c1d6bbe574ea64e3c91f580f7ea7a45cc967
Author: BABYR, ANDRII <email address hidden>
Date: Tue Apr 5 13:07:22 2016 -0700

    Fix notification options specification in controller's nova.conf

    This will allow to pass compute.instance.update events from Nova to Ceilometer
    nova_hash does not contain key 'notification_driver' so we switched
    to 'ceilometer' hash. Option notify_on_state_change was previously not
    specified at all but is needed.

    Closes-bug: #1566498
    Signed-off-by: Andrew Woodward <email address hidden>
    Change-Id: I81d9591c582221a6c6535b7aa65cf17c95f13fd9

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/mitaka
Review: https://review.openstack.org/343725

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/344893

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/344893
Committed: https://git.openstack.org/cgit/openstack/fuel-library/commit/?id=8d151b4be42d80f9f69e7fad1cc7cc886cd4d90e
Submitter: Jenkins
Branch: master

commit 8d151b4be42d80f9f69e7fad1cc7cc886cd4d90e
Author: Alex Schultz <email address hidden>
Date: Wed Jul 20 09:41:13 2016 -0600

    Update openstack controller yaql for ceilometer

    As part of the change for Bug 1566498, the ceilometer hash is the source
    of truth for the notification driver for nova. This needs to be included
    in the yaql expression for the openstack-controller task.

    Change-Id: If82b13beb13e302e1ed532014f4cf0f674240b02
    Related-Bug: #1566498

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/343725
Committed: https://git.openstack.org/cgit/openstack/fuel-library/commit/?id=5153e783bc9edf682be83b98aa7dd6dbb98b11a8
Submitter: Jenkins
Branch: stable/mitaka

commit 5153e783bc9edf682be83b98aa7dd6dbb98b11a8
Author: BABYR, ANDRII <email address hidden>
Date: Tue Apr 5 13:07:22 2016 -0700

    Fix notification options specification in controller's nova.conf

    This will allow to pass compute.instance.update events from Nova to Ceilometer
    nova_hash does not contain key 'notification_driver' so we switched
    to 'ceilometer' hash. Option notify_on_state_change was previously not
    specified at all but is needed.

    Closes-bug: #1566498
    Signed-off-by: Andrew Woodward <email address hidden>
    Change-Id: I81d9591c582221a6c6535b7aa65cf17c95f13fd9
    (cherry picked from commit b011c1d6bbe574ea64e3c91f580f7ea7a45cc967)

[Andrey Lavrentyev (alavrentyev)]

Verified on 9.1 snapshot #259

[root@nailgun ~]# shotgun2 short-report
cat /etc/fuel_build_id:
 495
cat /etc/fuel_build_number:
 495
cat /etc/fuel_release:
 9.0
cat /etc/fuel_openstack_version:
 mitaka-9.0
rpm -qa | egrep 'fuel|astute|network-checker|nailgun|packetary|shotgun':
 fuel-nailgun-9.0.0-1.mos8816.noarch
 fuelmenu-9.0.0-1.mos275.noarch
 fuel-provisioning-scripts-9.0.0-1.mos8816.noarch
 fuel-notify-9.0.0-1.mos8584.noarch
 shotgun-9.0.0-1.mos90.noarch
 python-fuelclient-9.0.0-1.mos350.noarch
 fuel-misc-9.0.0-1.mos8584.noarch
 fuel-agent-9.0.0-1.mos290.noarch
 python-packetary-9.0.0-1.mos149.noarch
 fuel-bootstrap-cli-9.0.0-1.mos290.noarch
 fuel-migrate-9.0.0-1.mos8584.noarch
 fuel-ui-9.0.0-1.mos2804.noarch
 nailgun-mcagents-9.0.0-1.mos764.noarch
 network-checker-9.0.0-1.mos74.x86_64
 fuel-utils-9.0.0-1.mos8584.noarch
 fuel-library9.0-9.0.0-1.mos8584.noarch
 fuel-mirror-9.0.0-1.mos149.noarch
 fuel-ostf-9.0.0-1.mos944.noarch
 fuel-openstack-metadata-9.0.0-1.mos8816.noarch
 rubygem-astute-9.0.0-1.mos764.noarch
 fuel-release-9.0.0-1.mos6355.noarch
 fuel-9.0.0-1.mos6355.noarch
 fuel-setup-9.0.0-1.mos6355.noarch

UBUNTU_MIRROR_ID=ubuntu-2016-08-03-174238
CENTOS_MIRROR_ID=centos-7.2.1511-2016-05-31-083834
MOS_UBUNTU_MIRROR_ID=9.0-2016-09-13-164322
MOS_CENTOS_OS_MIRROR_ID=os-2016-06-23-135731
MOS_CENTOS_PROPOSED_MIRROR_ID=proposed-2016-09-13-164322
MOS_CENTOS_UPDATES_MIRROR_ID=updates-2016-06-23-135916
MOS_CENTOS_HOLDBACK_MIRROR_ID=holdback-2016-06-23-140047
MOS_CENTOS_HOTFIX_MIRROR_ID=hotfix-2016-07-18-162958
MOS_CENTOS_SECURITY_MIRROR_ID=security-2016-06-23-140002