Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
0fa6619
Add Cloudkitty role variables definition to openstack-config.
MaxBed4d Apr 5, 2024
05a6443
Cloudkitty.yml example file.
MaxBed4d Apr 8, 2024
375183b
Added ratings role config and example. Changed requirements.
MaxBed4d Apr 8, 2024
5c95e93
Configure some cloudkitty settings.
MaxBed4d Apr 9, 2024
da06a05
Add type to GitHub requirements.
MaxBed4d Apr 9, 2024
d4a1650
Amend group variable default.
MaxBed4d Apr 9, 2024
15c130c
Fix Ansible Galaxy instructions
MoteHue Apr 9, 2024
0dac19c
Change cloudkitty venv to point to openstack_venv.
MaxBed4d Apr 9, 2024
f874110
Merge pull request #24 from stackhpc/fix-readme
markgoddard Apr 10, 2024
f95b0f8
Working Cloudkitty config.
MaxBed4d Apr 10, 2024
97f6f05
Updated and tidied config for Cloudkitty configuration role.
MaxBed4d Apr 10, 2024
5f39695
Tidy up group_vars
MaxBed4d Apr 10, 2024
71c5913
Pointing to the now merged CloudKitty Ansible role.
MaxBed4d Apr 10, 2024
6cbf191
Merge pull request #25 from stackhpc/cloudkitty-role-config
markgoddard Apr 11, 2024
cea418a
Allow extra labels in generated cluster templates
Apr 12, 2024
7ab4335
Improve handling of empty extra labels variable
Apr 16, 2024
a545002
Ensure required Magnum images are public
Apr 16, 2024
b0ae102
Merge pull request #27 from stackhpc/feat/allow-extra-magnum-labels
markgoddard Apr 17, 2024
e12b0f3
Merge pull request #28 from stackhpc/fix/magnum-image-visibility
markgoddard Apr 17, 2024
7801226
Update readme python venv instructions
Alex-Welsh Apr 22, 2024
00fb091
Merge pull request #29 from stackhpc/readme
markgoddard Apr 22, 2024
3d085a4
Allow unlimited server groups for Octavia
priteau May 7, 2024
786bada
Merge pull request #30 from stackhpc/octavia-server-group
priteau May 8, 2024
7f0e070
removed mention of Yoga
g0rgamesh Jun 3, 2024
b6d80b8
Merge pull request #31 from stackhpc/readme_update
g0rgamesh Jun 3, 2024
1fd68c8
Rework example security group to avoid SSH and ICMP in default secgroup
markgoddard Jul 8, 2024
707f921
Merge pull request #32 from stackhpc/example-secgroups
markgoddard Jul 8, 2024
54668be
Add ansible.cfg
cityofships Aug 14, 2024
2b63171
Bump stackhpc.openstack collection to 0.2.2
markgoddard Aug 14, 2024
e730ee1
Merge pull request #33 from stackhpc/ansible_cfg
markgoddard Aug 16, 2024
8cf03a8
Merge pull request #34 from stackhpc/bump-collection
markgoddard Aug 20, 2024
602136d
Fix Azimuth artefact URLs
cityofships Sep 26, 2024
6a15739
Use 22.04 in magnum-capi-images.j2
MoteHue Oct 14, 2024
6e18848
Use the latest collection
cityofships Nov 6, 2024
37ac0df
Merge pull request #39 from stackhpc/bump_collection
bbezak Nov 6, 2024
07e05c1
Support configuring Cinder volume types
priteau Dec 10, 2024
e17bed6
Merge pull request #40 from stackhpc/volume-types
priteau Dec 10, 2024
2074767
bump openstack.cloud version
GregWhiteyBialas Jan 22, 2025
b095d5a
Merge pull request #43 from stackhpc/opensctackcloud_version_bump
GregWhiteyBialas Jan 22, 2025
0a3a558
add default var definition for openstack_volumes_types
g0rgamesh Jan 29, 2025
156a803
Merge pull request #44 from stackhpc/volume_type_fix
g0rgamesh Jan 29, 2025
8576553
CI: Add ansible-lint
mnasiadka Jan 29, 2025
abe8e80
Fix all ansible-lint issues
mnasiadka Jan 29, 2025
699b14a
Merge pull request #45 from stackhpc/ci
g0rgamesh Jan 29, 2025
521f00b
make cloudkitty playbooks optional
g0rgamesh Jan 29, 2025
6233dd7
new line
g0rgamesh Jan 29, 2025
56a54b0
Merge pull request #46 from stackhpc/cloudkitty_opt-in
g0rgamesh Jan 29, 2025
4c36b5e
set GRUB vars in example file
g0rgamesh Feb 18, 2025
e55953a
Merge pull request #47 from stackhpc/grub_vars
g0rgamesh Feb 18, 2025
d450155
Merge pull request #38 from stackhpc/jammy-magnum-templates
MoteHue Feb 27, 2025
80516bc
Add newer version of ansible for later python
seunghun1ee Mar 18, 2025
c2508a6
Merge pull request #50 from stackhpc/master-test
mnasiadka Mar 18, 2025
c382516
Merge remote-tracking branch 'generic/main' into generic-config-sync
seunghun1ee Mar 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated and tidied config for Cloudkitty configuration role.
  • Loading branch information
MaxBed4d committed Apr 10, 2024
commit 97f6f05751f680069658688e314fc05a30803a35
63 changes: 22 additions & 41 deletions etc/openstack-config/openstack-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,19 @@
###############################################################################
# Configuration variables for a Cloudkitty ratings service deployment.

#
#
#
# # ### ####### ##### IN ORDER TO SUCCESSFULLY DEPLOY CLOUDKITTY
# # # # # # # 'cloudkitty.conf' & 'metrics.yml' MUST BE
# # # # # # ### PROVIDED ALONGSIDE THE FOLLOWING CONFIG.
# # # # # # # MORE INFO CAN BE FOUND IN THE README.md
# # ### # ##### 'stackhpc-kayobe-config' DOCS.

# File path or URL containing Python upper constraints.
#
# ratings_upper_constraints_file: /path/to/upper_constraints_file
####### THIS IS NOT NECCESSARY TO CONFIGURE ###########
#ratings_upper_constraints_file: /path/to/upper_constraints_file

# Environment variables for the OpenStack CLI. By default this is left empty.
#
# ratings_environment:
################### THIS IS NOT NECCESSARY TO CONFIGURE #####################
#ratings_environment:
# - name: ENV_VAR_NAME
# value: ENV_VAR_VALUE

Expand All @@ -118,44 +120,23 @@
# 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: instance
name: flavor_id
mappings:
- value: '1' #tiny
cost: 1.0
group: instance_uptime_flavor_id
type: flat
- value: '2' #small
cost: 2.0
group: instance_uptime_flavor_id
type: flat
- value: '3' #medium
cost: 3.0
group: instance_uptime_flavor_id
type: flat
- value: '4' #large
cost: 4.0
group: instance_uptime_flavor_id
type: flat
- value: '5' #xlarge
cost: 5.0
group: instance_uptime_flavor_id
type: flat
- value: '6' #tiny 2
cost: 2.0
group: instance_uptime_flavor_id
type: flat

#ratings_hashmap_field_mappings:
# - service: SERVICE_NAME
# name: FIELD_NAME
# mappings:
# - value: MAPPING_VALUE
# cost: MAPPING_COST
# group: MAPPING_GROUP
# type: MAPPING_TYPE

# 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: image.size
# cost: 0.1
# group: image_size
# type: flat
#ratings_hashmap_service_mappings:
# - service: SERVICE_NAME
# cost: MAPPING_COST
# group: MAPPING_GROUP
# type: MAPPING_TYPE

###############################################################################
# Dummy variable to allow Ansible to accept this file.
Expand Down
143 changes: 0 additions & 143 deletions etc/openstack-config/openstack-config_template.yml

This file was deleted.

103 changes: 75 additions & 28 deletions examples/ratings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,81 @@
###############################################################################
# Configuration of cloudkitty for openstack.

# Example playbook for configuring and registering Cloudkitty fields.
# Included is registration for two different Nova flavor mappings and
# 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.

- name: Ensure Cloudkitty ratings are registered
hosts: localhost
tasks:
- import_role:
name: stackhpc.openstack.os_ratings
vars:
os_ratings_venv: "{{ openstack_venv }}"
os_ratings_environment:
OS_AUTH_URL: "{{ lookup('env', 'OS_AUTH_URL') }}"
os_ratings_hashmap_field_mappings:
- service: instance
name: flavor_id
mappings:
- value: small
cost: 1.0
group: instance_uptime_flavor_id
type: flat
- value: large
cost: 2.0
group: instance_uptime_flavor_id
type: flat
os_ratings_hashmap_service_mappings:
- service: image.size
cost: 0.1
group: volume_ceph
type: flat
ratings_hashmap_field_mappings:
- service: instance
name: flavor_id
mappings:
- value: '1' #tiny
cost: 1.0
group: instance_uptime_flavor_id
type: flat
- value: '2' #small
cost: 2.0
group: instance_uptime_flavor_id
type: flat
- value: '3' #medium
cost: 3.0
group: instance_uptime_flavor_id
type: flat
- value: '4' #large
cost: 4.0
group: instance_uptime_flavor_id
type: flat
- value: '5' #xlarge
cost: 5.0
group: instance_uptime_flavor_id
type: flat
- value: '6' #tiny 2
cost: 2.0
group: instance_uptime_flavor_id
type: flat

ratings_hashmap_service_mappings:
- service: image.size
cost: 0.1
group: image_size
type: flat

# # ### ####### ##### THIS CONFIGURATION FILE ONLY WORKS IF
# # # # # # # 'cloudkitty.conf' & 'metrics.yml' ARE
# # # # # # ### CONFIGURED AS SHOWN BELOW. 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