Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove ceilometer pkg list per openstack sku
Ceilometer is supported on all supported openstack sku 3.0 onwards

Change-Id: I2e3beba8d30700d9a79aae977007381ae833cf4d
Partial-Bug: #150379
  • Loading branch information
Megh Bhatt committed Feb 12, 2016
1 parent af80e54 commit 8c9de1b
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions fabfile/utils/install.py
Expand Up @@ -125,7 +125,7 @@ def get_openstack_ceilometer_pkgs():
""" Returns the list of ceilometer packages used in a
openstack node.
"""
pkg_juno_ubuntu = ['ceilometer-api',
pkg_ubuntu = ['ceilometer-api',
'ceilometer-collector',
'ceilometer-agent-central',
'ceilometer-agent-notification',
Expand All @@ -134,36 +134,28 @@ def get_openstack_ceilometer_pkgs():
'ceilometer-plugin-contrail',
'mongodb-clients',
'python-pymongo']
pkg_kilo_ubuntu = copy.deepcopy(pkg_juno_ubuntu)
pkg_kilo_ubuntu.remove('ceilometer-plugin-contrail')

pkg_redhat = ['ceilometer-plugin-contrail']

ceilometer_pkgs = {
'ubuntu' : {
'juno' : pkg_juno_ubuntu,
'kilo' : pkg_kilo_ubuntu
},
'redhat' : {'juno' : pkg_redhat},
'ubuntu' : pkg_ubuntu,
'redhat' : pkg_redhat,
}

act_os_type = detect_ostype()
openstack_sku = get_openstack_sku()
return ceilometer_pkgs.get(act_os_type, {}).get(openstack_sku, [])
return ceilometer_pkgs.get(act_os_type, [])

def get_ceilometer_plugin_pkgs():
""" Returns the list of ceilometer plugin packages used in a
openstack node.
"""
pkg_contrail_ceilometer = ['ceilometer-plugin-contrail']
ceilometer_plugin_pkgs = {
'ubuntu' : {'juno' : pkg_contrail_ceilometer},
'redhat' : {'juno' : pkg_contrail_ceilometer},
'ubuntu' : {pkg_contrail_ceilometer},
'redhat' : {pkg_contrail_ceilometer},
}

act_os_type = detect_ostype()
openstack_sku = get_openstack_sku()
return ceilometer_plugin_pkgs.get(act_os_type, {}).get(openstack_sku, [])
return ceilometer_plugin_pkgs.get(act_os_type, [])

def get_compute_ceilometer_pkgs():
""" Returns the list of ceilometer packages used in a
Expand Down

0 comments on commit 8c9de1b

Please sign in to comment.