Merge "update naming conventions for secret vars"

README.rst

@@ -14,9 +14,9 @@ Required Variables
 
 .. code-block:: yaml
 
-    cloudkitty_user_password
+    cloudkitty_service_password
     cloudkitty_rabbitmq_password
-    cloudkitty_galera_password
+    cloudkitty_container_mysql_password
     cloudkitty_galera_address
 
 Example Playbook

defaults/main.yml

@@ -21,7 +21,7 @@ debug: False
 cloudkitty_package_state: "latest"
 cloudkitty_pip_package_state: "latest"
 
-cloudkitty_username: cloudkitty
+cloudkitty_service_user_name: cloudkitty
 
 cloudkitty_rabbitmq_userid: cloudkitty
 cloudkitty_rabbitmq_vhost: /cloudkitty
@@ -118,4 +118,4 @@ cloudkitty_role_project_group: cloudkitty_all
 # The messaging driver to use, defaults to rabbit. Other drivers
 # include qpid and zmq. (string value)
 cloudkitty_rpc_backend: rabbit
-cloudkitty_database_connection: "mysql+pymysql://{{ cloudkitty_galera_user }}:{{ cloudkitty_galera_password }}@{{ cloudkitty_galera_address }}/{{ cloudkitty_galera_database }}?charset=utf8"
+cloudkitty_database_connection: "mysql+pymysql://{{ cloudkitty_galera_user }}:{{ cloudkitty_container_mysql_password }}@{{ cloudkitty_galera_address }}/{{ cloudkitty_galera_database }}?charset=utf8"

extras/user_secrets_cloudkitty.yml

@@ -1,4 +1,4 @@
 ## Cloudkitty passwords
-cloudkitty_user_password:
+cloudkitty_service_password:
 cloudkitty_rabbitmq_password:
-cloudkitty_galera_password:
+cloudkitty_container_mysql_password:

tasks/cloudkitty_db_setup.yml

@@ -31,7 +31,7 @@
     login_password: "{{ galera_root_password }}"
     login_host: "{{ cloudkitty_galera_address }}"
     name: "{{ cloudkitty_galera_user }}"
-    password: "{{ cloudkitty_galera_password }}"
+    password: "{{ cloudkitty_container_mysql_password }}"
     host: "{{ item }}"
     state: "present"
     priv: "{{ cloudkitty_galera_database }}.*:ALL"

tasks/cloudkitty_domain_setup.yml

@@ -37,9 +37,9 @@
     login_user: "{{ keystone_admin_user_name }}"
     login_password: "{{ keystone_auth_admin_password }}"
     login_project_name: "{{ keystone_admin_tenant_name }}"
-    user_name: "{{ cloudkitty_username }}"
+    user_name: "{{ cloudkitty_service_user_name }}"
     domain_name: "{{ cloudkitty_user_domain_name }}"
-    password: "{{ cloudkitty_user_password }}"
+    password: "{{ cloudkitty_service_password }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   tags:
     - cloudkitty-domain
@@ -50,7 +50,7 @@
 - name: Add cloudkitty user to service admin role
   keystone:
     command: "ensure_user_role"
-    user_name: "{{ cloudkitty_username }}"
+    user_name: "{{ cloudkitty_service_user_name }}"
     project_name: "service"
     role_name: "admin"
     login_user: "{{ keystone_admin_user_name }}"

templates/cloudkitty.conf.j2

@@ -28,8 +28,8 @@ 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 }}
+password = {{ cloudkitty_service_password }}
+username = {{ cloudkitty_service_user_name }}
 auth_url = {{ keystone_service_adminurl }}
 auth_type = {{ cloudkitty_keystone_auth_plugin }}
 

tests/test-vars.yml

@@ -18,8 +18,8 @@ cloudkitty_developer_mode: true
 cloudkitty_git_install_branch: master
 cloudkitty_requirements_git_install_branch: master
 cloudkitty_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
-cloudkitty_galera_password: "SuperSecrete"
-cloudkitty_user_password: "secrete"
+cloudkitty_container_mysql_password: "SuperSecrete"
+cloudkitty_service_password: "secrete"
 cloudkitty_rabbitmq_password: "secrete"
 cloudkitty_rabbitmq_userid: cloudkitty
 cloudkitty_rabbitmq_vhost: /cloudkitty