Skip to content

Commit

Permalink
Ceilometer config file needs to be populated with
Browse files Browse the repository at this point in the history
keystone certs or insecure flag for it to communicate
with SSL enabled keystone and check for ceilometer support
in respective nodes.

Change-Id: If736de02b73aefeb477cc73a6c9e92cbf2ec8f38
Closes-Bug: 1645570
  • Loading branch information
cijohnson committed Dec 7, 2016
1 parent a5898d7 commit cbf3a61
Showing 1 changed file with 16 additions and 5 deletions.
21 changes: 16 additions & 5 deletions fabfile/tasks/provision.py
Expand Up @@ -720,11 +720,15 @@ def fixup_ceilometer_conf_keystone(openstack_ip):
sudo("%s auth_protocol %s" % (config_cmd, auth_protocol))
sudo("%s auth_port 35357" % config_cmd)
sudo("%s auth_host %s" % (config_cmd, openstack_ip))
if keystone_ssl_enabled():
sudo("%s insecure True" % config_cmd)
config_cmd = "openstack-config --set %s service_credentials" % conf_file
sudo("%s os_password CEILOMETER_PASS" % config_cmd)
sudo("%s os_tenant_name service" % config_cmd)
sudo("%s os_username ceilometer" % config_cmd)
sudo("%s os_auth_url %s://%s:5000/v2.0" % (config_cmd, auth_protocol, openstack_ip))
if keystone_ssl_enabled():
sudo("%s insecure True" % config_cmd)
#end fixup_ceilometer_conf_keystone

def fixup_ceilometer_pipeline_conf(analytics_ip):
Expand Down Expand Up @@ -961,6 +965,8 @@ def setup_ceilometer():
@task
def setup_ceilometer_node(*args):
"""Provisions ceilometer services in one or list of nodes. USAGE: fab setup_ceilometer_node:user@1.1.1.1,user@2.2.2.2"""
if not is_ceilometer_provision_supported():
return
analytics_ip = hstr_to_ip(env.roledefs['collector'][0])
for host_string in args:
self_host = get_control_host_string(host_string)
Expand Down Expand Up @@ -1026,6 +1032,8 @@ def setup_network_service():
def setup_network_service_node(*args):
"""Provisions network services in one or list of nodes.
USAGE: fab setup_network_service_node:user@1.1.1.1,user@2.2.2.2"""
if not is_ceilometer_provision_supported():
return
conf_file = '/etc/neutron/neutron.conf'
neutron_config = {'DEFAULT' : {'notification_driver' : 'neutron.openstack.common.notifier.rpc_notifier'}
}
Expand All @@ -1047,6 +1055,8 @@ def setup_identity_service():
def setup_identity_service_node(*args):
"""Provisions identity services in one or list of nodes.
USAGE: fab setup_identity_service_node:user@1.1.1.1,user@2.2.2.2"""
if not is_ceilometer_provision_supported():
return
amqp_server_ip = get_openstack_amqp_server()

conf_file = '/etc/keystone/keystone.conf'
Expand All @@ -1071,6 +1081,8 @@ def setup_image_service():
@task
def setup_image_service_node(*args):
"""Provisions image services in one or list of nodes. USAGE: fab setup_image_service_node:user@1.1.1.1,user@2.2.2.2"""
if not is_ceilometer_provision_supported():
return
amqp_server_ip = get_openstack_amqp_server()
for host_string in args:
openstack_sku = get_openstack_sku()
Expand Down Expand Up @@ -2539,11 +2551,10 @@ def setup_orchestrator():
if orch == 'openstack':
execute('increase_ulimits')
execute('setup_openstack')
if is_ceilometer_provision_supported():
execute("setup_ceilometer")
execute("setup_network_service") #Provisions in cfgm node
execute("setup_image_service",)
execute("setup_identity_service")
execute("setup_ceilometer")
execute("setup_network_service") #Provisions in cfgm node
execute("setup_image_service",)
execute("setup_identity_service")
execute('verify_openstack')
#setup_vcenter can be called outside of setup_all and need not be below. So commenting.
#elif orch == 'vcenter':
Expand Down

0 comments on commit cbf3a61

Please sign in to comment.