Tidy up group_vars

Tidy up.

Author: MaxBed4d

ansible/group_vars/all/openstack

@@ -49,41 +49,27 @@ openstack_image_elements: []
 # List of diskimage-builder element git repos to pull
 openstack_image_git_elements: []
 ###############################################################################
-# Configuration variables for a Cloudkitty ratings service deployment.
+# Configuration variables for a CloudKitty ratings service deployment.
 
 # File path or URL containing Python upper constraints.
 #
-ratings_upper_constraints_file: []
+openstack_ratings_upper_constraints_file: []
 
 # Environment variables for the OpenStack CLI. By default this is left empty.
 #
-ratings_environment: []
-#  - name: ENV_VAR_NAME
-#    value: ENV_VAR_VALUE
+openstack_ratings_environment: []
 
 # A list where each item is a dictionary mapping the associated fields, 
 # with the 'mappings' field also being a list of dictionaries. 
 # Example of the mappings and their fields can be found below, 
 # however for more information please refer to the README.md file.
 #
-ratings_hashmap_field_mappings: []
-#  - service: SERVICE_NAME
-#    name: FIELD_NAME
-#    mappings:
-#      - value: MAPPING_VALUE
-#        cost: MAPPING_COST
-#        group: MAPPING_GROUP
-#        type: MAPPING_TYPE
+openstack_ratings_hashmap_field_mappings: []
 
 # Much like the field mappings above, the service mappings are a list of
 # dictionaries, however these are not associated with a field.
 #
-ratings_hashmap_service_mappings: []
-#  - service: SERVICE_NAME
-#    cost: MAPPING_COST
-#    group: MAPPING_GROUP
-#    type: MAPPING_TYPE
-
+openstack_ratings_hashmap_service_mappings: []
 
 ###############################################################################
 # Configuration of nova host aggregates for OpenStack.

ansible/openstack-ratings.yml

@@ -5,8 +5,8 @@
     - ratings
   roles:
     - role: stackhpc.openstack.os_ratings
-      os_ratings_hashmap_field_mappings: "{{ ratings_hashmap_field_mappings }}"
-      os_ratings_hashmap_service_mappings: "{{ ratings_hashmap_service_mappings }}"
+      os_ratings_hashmap_field_mappings: "{{ openstack_ratings_hashmap_field_mappings }}"
+      os_ratings_hashmap_service_mappings: "{{ openstack_ratings_hashmap_service_mappings }}"
       os_ratings_venv: "{{ openstack_venv }}"
-      os_ratings_upper_constraints_file: "{{ ratings_upper_constraints_file }}"
-      os_ratings_environment: "{{ ratings_environment }}"
+      os_ratings_upper_constraints_file: "{{ openstack_ratings_upper_constraints_file }}"
+      os_ratings_environment: "{{ openstack_ratings_environment }}"

ansible/openstack.yml

@@ -6,4 +6,4 @@
 - import_playbook: openstack-images.yml
 - import_playbook: openstack-host-aggregates.yml
 - import_playbook: openstack-container-clusters.yml
-- import_playbook: openstack-ratings.yml
+- import_playbook: openstack-ratings.yml

etc/openstack-config/openstack-config.yml

@@ -97,7 +97,7 @@
 # magnum_cluster_templates_public:
 
 ###############################################################################
-# Configuration variables for a Cloudkitty ratings service deployment.
+# Configuration variables for a CloudKitty ratings service deployment.
 
 #     #    ###   #######  #####    IN ORDER TO SUCCESSFULLY DEPLOY CLOUDKITTY
 # #   #   #   #     #     #        'cloudkitty.conf' & 'metrics.yml' MUST BE    
@@ -107,11 +107,11 @@
 
 # File path or URL containing Python upper constraints.
 ####### THIS IS NOT NECCESSARY TO CONFIGURE ###########
-#ratings_upper_constraints_file: /path/to/upper_constraints_file
+#openstack_ratings_upper_constraints_file: /path/to/upper_constraints_file
 
 # Environment variables for the OpenStack CLI. By default this is left empty.
 ################### THIS IS NOT NECCESSARY TO CONFIGURE #####################
-#ratings_environment:
+#openstack_ratings_environment:
 #  - name: ENV_VAR_NAME
 #    value: ENV_VAR_VALUE
 
@@ -120,7 +120,7 @@
 # Example of the mappings and their fields can be found below, 
 # however for more information please refer to the README.md file.
 #
-#ratings_hashmap_field_mappings:
+#openstack_ratings_hashmap_field_mappings:
 #  - service: SERVICE_NAME
 #    name: FIELD_NAME
 #    mappings:
@@ -132,7 +132,7 @@
 # Much like the field mappings above, the service mappings are a list of
 # dictionaries, however these are not associated with a field.
 #
-#ratings_hashmap_service_mappings:
+#openstack_ratings_hashmap_service_mappings:
 #  - service: SERVICE_NAME
 #    cost: MAPPING_COST
 #    group: MAPPING_GROUP

examples/ratings.yml

@@ -1,41 +1,41 @@
 ---
 ###############################################################################
-# Configuration of cloudkitty for openstack.
+# Configuration of CloudKitty for openstack.
 
-# Example configuration for registering Cloudkitty fields.
+# Example configuration for registering CloudKitty fields.
 # Included is mapping for various different compute flavors & 
 # a service mapping based on the stored image size in Glance. 
 
-ratings_hashmap_field_mappings:
+openstack_ratings_hashmap_field_mappings:
   - service: instance
     name: flavor_id
     mappings:
-      - value: '1' #tiny
+      - value: '1' #tiny compute flavour with an OpenStack flavor ID of 1
         cost: 1.0
         group: instance_uptime_flavor_id
         type: flat
-      - value: '2' #small
+      - value: '2' #small compute flavour with an OpenStack flavor ID of 2
         cost: 2.0
         group: instance_uptime_flavor_id
         type: flat
-      - value: '3' #medium
+      - value: '3' #medium compute flavour with an OpenStack flavor ID of 3
         cost: 3.0
         group: instance_uptime_flavor_id
         type: flat
-      - value: '4' #large
+      - value: '4' #large compute flavour with an OpenStack flavor ID of 4
         cost: 4.0
         group: instance_uptime_flavor_id
         type: flat
-      - value: '5' #xlarge
+      - value: '5' #xlarge compute flavour with an OpenStack flavor ID of 5
         cost: 5.0
         group: instance_uptime_flavor_id
         type: flat
-      - value: '6' #tiny 2
+      - value: '6' #tiny 2 compute flavour with an OpenStack flavor ID of 6
         cost: 2.0
         group: instance_uptime_flavor_id
         type: flat
 
-ratings_hashmap_service_mappings:
+openstack_ratings_hashmap_service_mappings:
   - service: image.size
     cost: 0.1
     group: image_size
@@ -79,4 +79,4 @@ ratings_hashmap_service_mappings:
 #     unit: GiB
 #     groupby:
 #       - resource_id
-#       - project_id
+#       - project_id