Make corrections to default variables

openstack/openstack-ansible-os_cloudkitty

Code Issues Proposed changes

Update default variables with a few corrections:
 * Fix name of 'cloudkitty_output_pipeline' variable
 * Change 'cloudkitty_service_type' to 'rating'
 * Remove unnecessary and redundant 'cloudkitty_pip_packages'
Change-Id: I9768471d1f67d074282e63033d9bd626fb4175af

This commit is contained in:

Jimmy McCrory

2016年08月02日 09:29:16 -07:00

parent 82e98d699a

commit 870f41d21f

2 changed files with 3 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

15
defaults/main.yml

View File

@@ -54,7 +54,7 @@ cloudkitty_user_domain_name: Default

cloudkitty_keystone_auth_plugin:password

cloudkitty_keystone_trustee_auth_plugin:v2password

cloudkitty_output_backend:cloudkitty.backend.file.FileBackend

cloudkitty_output_pipline:osrf

cloudkitty_output_pipeline:osrf

cloudkitty_output_basepath:/var/cloudkitty/reports

cloudkitty_signing_dir:/var/cache/cloudkitty

@@ -69,7 +69,7 @@ cloudkitty_service_proto: http

cloudkitty_service_publicuri_proto:"{{ openstack_service_publicuri_proto | default(cloudkitty_service_proto) }}"

cloudkitty_service_adminuri_proto:"{{ openstack_service_adminuri_proto | default(cloudkitty_service_proto) }}"

cloudkitty_service_internaluri_proto:"{{ openstack_service_internaluri_proto | default(cloudkitty_service_proto) }}"

cloudkitty_service_type:orchestration

cloudkitty_service_type:rating

cloudkitty_service_publicuri:"{{ cloudkitty_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ cloudkitty_service_port }}"

cloudkitty_service_publicurl:"{{ cloudkitty_service_publicuri }}/"

cloudkitty_service_adminuri:"{{ cloudkitty_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ cloudkitty_service_port }}"

@@ -89,21 +89,10 @@ cloudkitty_service_names:

cloudkitty_pip_packages:

- cloudkitty

- tooz

- msgpack-python

- keystonemiddleware

- PyMySQL

- python-memcached

- pycrypto

- python-ceilometerclient

- python-cinderclient

- python-glanceclient

- python-keystoneclient

- python-neutronclient

- python-novaclient

- python-openstackclient

- python-swiftclient

- python-troveclient

cloudkitty_requires_pip_packages:

- virtualenv

2
templates/cloudkitty.conf.j2

View File

@@ -51,7 +51,7 @@ rabbit_virtual_host = {{ cloudkitty_rabbitmq_vhost }}

rabbit_use_ssl = {{ rabbitmq_use_ssl }}

[output]

pipeline = {{ cloudkitty_output_pipline }}

pipeline = {{ cloudkitty_output_pipeline }}

basepath = {{ cloudkitty_output_basepath }}

backend = {{ cloudkitty_output_backend }}