Pointing to the now merged CloudKitty Ansible role.

Author: MaxBed4d

ansible/group_vars/all/openstack

@@ -48,16 +48,23 @@ 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 of nova host aggregates for OpenStack.
 
-# File path or URL containing Python upper constraints.
-#
-openstack_ratings_upper_constraints_file: []
+# List of host aggregates in the openstack project.
+# Format is as required by the stackhpc.os_host_aggregates role.
+openstack_host_aggregates: []
 
-# Environment variables for the OpenStack CLI. By default this is left empty.
-#
-openstack_ratings_environment: []
+###############################################################################
+# Configuration of container clusters templates for OpenStack.
+
+# List of clusters templates in the openstack project. Format is as required by the
+# stackhpc.os-container-clusters role.
+openstack_container_clusters_templates: []
+
+###############################################################################
+# Configuration variables for a CloudKitty ratings service deployment.
 
 # A list where each item is a dictionary mapping the associated fields, 
 # with the 'mappings' field also being a list of dictionaries. 
@@ -70,17 +77,3 @@ openstack_ratings_hashmap_field_mappings: []
 # dictionaries, however these are not associated with a field.
 #
 openstack_ratings_hashmap_service_mappings: []
-
-###############################################################################
-# Configuration of nova host aggregates for OpenStack.
-
-# List of host aggregates in the openstack project.
-# Format is as required by the stackhpc.os_host_aggregates role.
-openstack_host_aggregates: []
-
-###############################################################################
-# Configuration of container clusters templates for OpenStack.
-
-# List of clusters templates in the openstack project. Format is as required by the
-# stackhpc.os-container-clusters role.
-openstack_container_clusters_templates: []

ansible/openstack-ratings.yml

@@ -8,5 +8,3 @@
       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: "{{ openstack_ratings_upper_constraints_file }}"
-      os_ratings_environment: "{{ openstack_ratings_environment }}"

etc/openstack-config/openstack-config.yml

@@ -105,38 +105,29 @@
 #   # #   #   #     #     #        MORE INFO CAN BE FOUND IN THE README.md
 #     #    ###      #     #####    'stackhpc-kayobe-config' DOCS.
 
-# File path or URL containing Python upper constraints.
-####### THIS IS NOT NECCESSARY TO CONFIGURE ###########
-#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 #####################
-#openstack_ratings_environment:
-#  - name: ENV_VAR_NAME
-#    value: ENV_VAR_VALUE
 
 # 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.
+# 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 stackhpc.openstack.os_ratings role docs.
 #
 #openstack_ratings_hashmap_field_mappings:
 #  - service: SERVICE_NAME
-#    name: FIELD_NAME
-#    mappings:
+#    name: FIELD_NAME 
+#    mappings:          
 #      - value: MAPPING_VALUE
 #        cost: MAPPING_COST
-#        group: MAPPING_GROUP
 #        type: MAPPING_TYPE
+#        group: MAPPING_GROUP <---THIS IS OPTIONAL---
 
 # Much like the field mappings above, the service mappings are a list of
 # dictionaries, however these are not associated with a field.
 #
 #openstack_ratings_hashmap_service_mappings:
 #  - service: SERVICE_NAME
 #    cost: MAPPING_COST
-#    group: MAPPING_GROUP
 #    type: MAPPING_TYPE
+#    group: MAPPING_GROUP <---THIS IS OPTIONAL---
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

examples/ratings.yml

@@ -43,40 +43,7 @@ openstack_ratings_hashmap_service_mappings:
 
 #     #    ###   #######  #####    THIS CONFIGURATION FILE ONLY WORKS IF
 # #   #   #   #     #     #        'cloudkitty.conf' & 'metrics.yml' ARE    
-#  #  #   #   #     #     ###      CONFIGURED AS SHOWN BELOW. MORE INFO CAN
+#  #  #   #   #     #     ###      CONFIGURED CORRECTLY. MORE INFO CAN
 #   # #   #   #     #     #        BE FOUND IN THE 'stackhpc-kayobe-config' 
 #     #    ###      #     #####    DOCS.
 
-
-# CORRESPONDING cloudkitty.conf
-#
-# [collect]
-# period = 120
-# scope_key = tenant_id
-
-# CORRESPONDING metrics.yml
-#
-# metrics:
-#   openstack_nova_server_status:
-#     alt_name: instance
-#     unit: instance
-#     mutate: MAP
-#     mutate_map:
-#       0.0: 1.0  # ACTIVE
-#       11.0: 1.0 # SHUTOFF
-#       12.0: 1.0 # SUSPENDED
-#       16.0: 1.0 # PAUSED
-#     groupby:
-#       - user_id
-#       - tenant_id
-#       - uuid
-#     metadata:
-#       - flavor_id
-#       - name
-#   openstack_glance_image_bytes:
-#     alt_name: image.size
-#     factor: 1/1073741824 # image.size measurements are in B
-#     unit: GiB
-#     groupby:
-#       - resource_id
-#       - project_id

requirements.yml

@@ -2,8 +2,5 @@
 collections:
   - name: openstack.cloud
     version: 2.1.0
-  - name: https://github.com/stackhpc/ansible-collection-openstack.git
-    type: git
-    version: cloudkitty
-  # - name: stackhpc.openstack
-  #   version: 0.1.1
+  - name: stackhpc.openstack
+    version: 0.2.0