Skip to content

Commit 0dac19c

Browse files
committed
Change cloudkitty venv to point to openstack_venv.
1 parent d4a1650 commit 0dac19c

File tree

5 files changed

+139
-10
lines changed

5 files changed

+139
-10
lines changed

ansible/group_vars/all/openstack

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ openstack_image_git_elements: []
5151
###############################################################################
5252
# Configuration variables for a Cloudkitty ratings service deployment.
5353

54-
# Path to where a virtual environment directory will be created.
55-
#
56-
ratings_venv: "~/os-ratings-venv"
57-
5854
# File path or URL containing Python upper constraints.
5955
#
6056
ratings_upper_constraints_file: []

ansible/openstack-ratings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
- role: stackhpc.openstack.os_ratings
88
os_ratings_hashmap_field_mappings: "{{ ratings_hashmap_field_mappings }}"
99
os_ratings_hashmap_service_mappings: "{{ ratings_hashmap_service_mappings }}"
10-
os_ratings_venv: "{{ ratings_venv }}"
10+
os_ratings_venv: "{{ openstack_venv }}"
1111
os_ratings_upper_constraints_file: "{{ ratings_upper_constraints_file }}"
1212
os_ratings_environment: "{{ ratings_environment }}"

etc/openstack-config/openstack-config.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@
9999
###############################################################################
100100
# Configuration variables for a Cloudkitty ratings service deployment.
101101

102-
# Path to where a virtual environment directory will be created.
103-
#
104-
ratings_venv: "~/os-ratings-venv"
105-
106102
# File path or URL containing Python upper constraints.
107103
#
108104
# ratings_upper_constraints_file: /path/to/upper_constraints_file
Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
---
2+
###############################################################################
3+
# Configuration of OpenStack projects and users user environment.
4+
5+
# List of OpenStack domains. Format is as required by the stackhpc.os-projects
6+
# role.
7+
#openstack_domains:
8+
9+
# List of OpenStack projects. Format is as required by the stackhpc.os-projects
10+
# role.
11+
#openstack_projects:
12+
13+
###############################################################################
14+
# Configuration of networks, subnets and routers.
15+
16+
# List of networks in the openstack system. Format is as required by the
17+
# stackhpc.os-networks role.
18+
#openstack_networks:
19+
20+
# List of routers in the openstack project. Format is as required by the
21+
# stackhpc.os-networks role.
22+
#openstack_routers:
23+
24+
# List of security groups in the openstack project.
25+
# Format is as required by the stackhpc.os-networks role.
26+
#openstack_security_groups:
27+
28+
# List of RBAC definitions in the openstack projct. Format is as required by the
29+
# stackhpc.os-networks role.
30+
#openstack_networks_rbac:
31+
32+
###############################################################################
33+
# Configuration of nova flavors.
34+
35+
# List of nova flavors in the openstack project. Format is as required by the
36+
# stackhpc.os-flavors role.
37+
#openstack_flavors:
38+
39+
###############################################################################
40+
# Configuration of nova host aggregates.
41+
42+
# List of nova host aggregates. Format is as required by the
43+
# stackhpc.os_host_aggregates role.
44+
#openstack_host_aggregates:
45+
46+
###############################################################################
47+
# Configuration of Glance software images.
48+
49+
# List of Glance images. Format is as required by the stackhpc.os-images role.
50+
#openstack_images:
51+
52+
# List of Diskimage Builder (DIB) elements paths to include in image builds.
53+
#openstack_image_elements:
54+
55+
# List of Diskimage Builder (DIB) elements Git repositories to use in image
56+
# builds.
57+
#openstack_image_git_elements:
58+
59+
###############################################################################
60+
# Configuration of Magnum container clusters.
61+
62+
# List of magnum cluster templates. Format is as required by the
63+
# stackhpc.os-container-clusters role.
64+
#openstack_container_clusters_templates:
65+
66+
###############################################################################
67+
# Configuration variables for generating new Magnum cluster template config.
68+
69+
# These variables must be defined before using the generating new cluster
70+
# templates - see repo README for more details.
71+
72+
# Must have at least 2 CPUs, 4GB RAM and 20GB disk
73+
# magnum_default_master_flavor_name:
74+
# magnum_default_worker_flavor_name:
75+
76+
# Network to create tenant cluster FIPs on
77+
# magnum_external_net_name:
78+
79+
# Provider for cluster loadbalancers (e.g. 'ovn')
80+
# magnum_loadbalancer_provider:
81+
82+
# Kubernetes CNI to use for cluster templates (defaults to 'calico')
83+
# Must be one of the options supported by capi-helm-charts, see
84+
# https://github.com/stackhpc/capi-helm-charts/tree/main/charts/cluster-addons#container-network-interface-cni-plugins
85+
# magnum_default_network_driver:
86+
87+
# Whether to create a master nodes loadbalancer for cluster templates (defaults to 'True')
88+
# magnum_master_lb_enabled:
89+
90+
# Whether to add a floating IP to the loadbalancer for cluster templates (defaults to 'True')
91+
# magnum_cluster_floating_ip_enabled:
92+
93+
# List of nameservers to use for cluster templates
94+
# magnum_cluster_default_dns_nameservers:
95+
96+
# Whether generated cluster templates should be public by default (defaults to 'True')
97+
# magnum_cluster_templates_public:
98+
99+
###############################################################################
100+
# Configuration variables for a Cloudkitty ratings service deployment.
101+
102+
# File path or URL containing Python upper constraints.
103+
#
104+
#ratings_upper_constraints_file: /path/to/upper_constraints_file
105+
106+
# Environment variables for the OpenStack CLI. By default this is left empty.
107+
#
108+
#ratings_environment:
109+
# - name: ENV_VAR_NAME
110+
# value: ENV_VAR_VALUE
111+
112+
# A list where each item is a dictionary mapping the associated fields,
113+
# with the 'mappings' field also being a list of dictionaries.
114+
# Example of the mappings and their fields can be found below,
115+
# however for more information please refer to the README.md file.
116+
#
117+
#ratings_hashmap_field_mappings:
118+
# - service: SERVICE_NAME
119+
# name: FIELD_NAME
120+
# mappings:
121+
# - value: MAPPING_VALUE
122+
# cost: MAPPING_COST
123+
# group: MAPPING_GROUP
124+
# type: MAPPING_TYPE
125+
126+
# Much like the field mappings above, the service mappings are a list of
127+
# dictionaries, however these are not associated with a field.
128+
#
129+
#ratings_hashmap_service_mappings:
130+
# - service: SERVICE_NAME
131+
# cost: MAPPING_COST
132+
# group: MAPPING_GROUP
133+
# type: MAPPING_TYPE
134+
135+
###############################################################################
136+
# Dummy variable to allow Ansible to accept this file.
137+
workaround_ansible_issue_8743: yes

examples/ratings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
- import_role:
1313
name: stackhpc.openstack.os_ratings
1414
vars:
15-
os_ratings_venv: "~/os-ratings-venv"
15+
os_ratings_venv: "{{ openstack_venv }}"
1616
os_ratings_environment:
1717
OS_AUTH_URL: "{{ lookup('env', 'OS_AUTH_URL') }}"
1818
os_ratings_hashmap_field_mappings:

0 commit comments

Comments
 (0)