fixing up the template

The template for cloudkitty.conf was mostly hard
coded. This change adds the variables to many of
the hard coded things.

defaults/main.yml

@@ -14,26 +14,40 @@
 # limitations under the License.
 cloudkitty_username: cloudkitty
 cloudkitty_user_password: secrete
+
+cloudkitty_rabbitmq_userid: cloudkitty
 cloudkitty_rabbitmq_password: secrete
+
 cloudkitty_system_group_name: cloudkitty
 cloudkitty_system_user_name: cloudkitty
 cloudkitty_system_comment: meow
 cloudkitty_system_shell: /bin/false
+
 cloudkitty_venv_tag: untagged
 cloudkitty_venv_dir: "/openstack/venvs/cloudkitty-{{ cloudkitty_venv_tag }}"
+
 cloudkitty_git_repo: https://github.com/openstack/cloudkitty.git
 cloudkitty_git_install_branch: master
+
 cloudkitty_requirements_git_repo: https://git.openstack.org/openstack/requirements
 cloudkitty_requirements_git_install_branch: master
+
 cloudkitty_developer_mode: false
 cloudkitty_notification_topics: openstack
-cloudkitty_services: nova
+cloudkitty_services: compute
 cloudkitty_collector: ceilometer
 cloudkitty_project_name: admin
 cloudkitty_project_domain_name: Default
+cloudkitty_service_project_domain_id: default
+cloudkitty_service_project_name: "service"
+cloudkitty_service_user_domain_id: default
+
 cloudkitty_user_domain_name: Default
-cloudkitty_domain_admin_password: secrete
-cloudkitty_domain_admin: stack_domain_admin
+cloudkitty_keystone_auth_plugin: password
+cloudkitty_keystone_trustee_auth_plugin: v2password
+cloudkitty_output_backend: cloudkitty.backend.file.FileBackend
+cloudkitty_output_pipline: osrf
+cloudkitty_output_basepath: /var/cloudkitty/reports
 
 cloudkitty_galera_database: cloudkitty
 cloudkitty_galera_user: cloudkitty
@@ -58,11 +72,9 @@ cloudkitty_cloudkitty_conf_overrides: {}
 cloudkitty_policy_overrides: {}
 cloudkitty_api_paste_ini_overrides: {}
 cloudkitty_service_names: []
-cloudkitty_developer_constraints:
-  "git+{{ cloudkitty_git_repo }}@{{ cloudkitty_git_install_branch }}#egg=cloudkitty"
 
 cloudkitty_pip_packages:
-  - "{{ cloudkitty_developer_constraints }}"
+  - cloudkitty
   - tooz
   - msgpack-python
   - keystonemiddleware

tasks/cloudkitty_post_install.yml

@@ -30,7 +30,7 @@
       config_overrides: "{{ cloudkitty_cloudkitty_conf_overrides }}"
       config_type: "ini"
     - src: "api-paste.ini.j2"
-      dest: "/etc/cloudkitty/api-paste.ini"
+      dest: "/etc/cloudkitty/api_paste.ini"
       config_overrides: "{{ cloudkitty_api_paste_ini_overrides }}"
       config_type: "ini"
     - src: "policy.json.j2"

tasks/cloudkitty_pre_install.yml

@@ -105,3 +105,13 @@
   tags:
     - cloudkitty-usage-install
     - cloudkitty-usage-install-pip-packages
+
+- name: Create cloudkitty report dir
+  file:
+    path: "{{ cloudkitty_output_basepath }}"
+    state: directory
+    owner: "{{ cloudkitty_system_user_name }}"
+    group: "{{ cloudkitty_system_group_name }}"
+    mode: 0755
+  tags:
+    - cloudkitty-dirs

templates/cloudkitty.conf.j2

@@ -4,50 +4,68 @@
 debug = {{ debug }}
 notification_topics = {{ cloudkitty_notification_topics }}
 rpc_backend = {{ cloudkitty_rpc_backend }}
+
 [api]
+port = {{ cloudkitty_service_port }}
+
 [collect]
 services = {{ cloudkitty_services }}
 collector = {{ cloudkitty_collector }}
+
 [cors]
+
 [cors.subdomain]
+
 [database]
 connection = {{ cloudkitty_database_connection }}
+
 [keystone_authtoken]
-memcached_servers = 166.78.242.99:11211
+memcached_servers = {{ memcached_servers }}
 signing_dir = /var/cache/cloudkitty
-cafile = /opt/stack/data/ca-bundle.pem
-auth_uri = http://166.78.242.99:5000
-project_domain_id = default
-project_name = service
-user_domain_id = default
-password = secrete
-username = cloudkitty
-auth_url = http://166.78.242.99:35357
-auth_type = password
+auth_uri = {{ keystone_service_internaluri }}
+project_domain_id = {{ cloudkitty_service_project_domain_id }}
+project_name = {{ cloudkitty_service_project_name }}
+user_domain_id = {{ cloudkitty_service_user_domain_id }}
+password = {{ cloudkitty_user_password }}
+username = {{ cloudkitty_username }}
+auth_url = {{ keystone_service_adminurl }}
+auth_type = {{ cloudkitty_keystone_auth_plugin }}
+
 [keystone_fetcher]
 auth_section = authinfos
+
 [matchmaker_redis]
+
 [matchmaker_ring]
+
 [oslo_messaging_amqp]
+
 [oslo_messaging_qpid]
+
 [oslo_messaging_rabbit]
-rabbit_userid = stackrabbit
-rabbit_password = secrete
-rabbit_hosts = 166.78.242.99
+rabbit_userid = {{ cloudkitty_rabbitmq_userid }}
+rabbit_password = {{ cloudkitty_rabbitmq_password }}
+rabbit_hosts = {{ rabbitmq_servers }}
+
 [output]
-pipeline = osrf
-basepath = /opt/stack/data/cloudkitty/reports
-backend = cloudkitty.backend.file.FileBackend
+pipeline = {{ cloudkitty_output_pipline }}
+basepath = {{ cloudkitty_output_basepath }}
+backend = {{ cloudkitty_output_backend }}
+
 [state]
+
 [storage]
+
 [tenant_fetcher]
+
 [authinfos]
-debug = True
-region_name = RegionOne
+debug = {{ debug }}
+region_name = {{ service_region }}
 tenant_name = service
-password = secrete
-username = cloudkitty
-auth_url = http://166.78.242.99:5000/v2.0/
-auth_plugin = v2password
+password = {{ cloudkitty_user_password }}
+username = {{ cloudkitty_username }}
+auth_url = {{ keystone_service_adminurl }}
+auth_plugin = {{ cloudkitty_keystone_trustee_auth_plugin }}
+
 [ceilometer_collector]
 auth_section = authinfos