Skip to content

Commit 416090d

Browse files
markgoddardpriteau
authored andcommitted
Add defaults for required variables
1 parent 63cd2cf commit 416090d

File tree

3 files changed

+80
-21
lines changed

3 files changed

+80
-21
lines changed

ansible/group_vars/all/openstack

Lines changed: 55 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,56 @@
11
---
2-
# Configuration of OpenStack authentication variables.
3-
4-
# Cloud authentication type. This should be a string compatible with the
5-
# 'auth_type' argument of most 'os_*' Ansible modules.
6-
openstack_auth_type: "password"
7-
8-
# Cloud authentication parameters. This should be a dict providing items
9-
# compatible with the 'auth' argument of most 'os_*' Ansible modules.
10-
# By default we pull these from the environment of the shell executing Ansible.
11-
openstack_auth:
12-
project_domain_id: "{{ lookup('env', 'OS_PROJECT_DOMAIN_ID') }}"
13-
user_domain_id: "{{ lookup('env', 'OS_USER_DOMAIN_ID') }}"
14-
project_domain_name: "{{ lookup('env', 'OS_PROJECT_DOMAIN_NAME') }}"
15-
user_domain_name: "{{ lookup('env', 'OS_USER_DOMAIN_NAME') }}"
16-
project_id: "{{ lookup('env', 'OS_PROJECT_ID') }}"
17-
project_name: "{{ lookup('env', 'OS_PROJECT_NAME') }}"
18-
username: "{{ lookup('env', 'OS_USERNAME') }}"
19-
password: "{{ lookup('env', 'OS_PASSWORD') }}"
20-
auth_url: "{{ lookup('env', 'OS_AUTH_URL') }}"
21-
22-
openstack_cacert: "{{ lookup('env', 'OS_CACERT') }}"
2+
###############################################################################
3+
# Configuration of OpenStack user environment for OpenStack.
4+
5+
# List of OpenStack projects. Format is as required by the stackhpc.os-projects
6+
# role.
7+
openstack_projects: []
8+
9+
###############################################################################
10+
# Configuration of networks, subnets and routers for OpenStack.
11+
12+
# List of networks in the openstack project. Format is as required by the
13+
# stackhpc.os-networks role.
14+
openstack_networks: []
15+
16+
# List of routers in the openstack project. Format is as required by the
17+
# stackhpc.os-networks role.
18+
openstack_routers: []
19+
20+
# List of security groups in the openstack demo project. Format is as required by the
21+
# stackhpc.os-networks role.
22+
openstack_security_groups: []
23+
24+
###############################################################################
25+
# Configuration of nova flavors for OpenStack.
26+
27+
# List of nova flavors in the openstack project. Format is as required by the
28+
# stackhpc.os-flavors role.
29+
openstack_flavors: []
30+
31+
###############################################################################
32+
# Configuration of glance images for OpenStack.
33+
34+
# List of glance images in the openstack project. Format is as required by the
35+
# stackhpc.os-images role.
36+
openstack_images: []
37+
38+
# List of additional diskimage-builder elements to incorporate on the path
39+
openstack_image_elements: []
40+
41+
# List of diskimage-builder element git repos to pull
42+
openstack_image_git_elements: []
43+
44+
###############################################################################
45+
# Configuration of nova host aggregates for OpenStack.
46+
47+
# List of host aggregates in the openstack project.
48+
# Format is as required by the stackhpc.os_host_aggregates role.
49+
openstack_host_aggregates: []
50+
51+
###############################################################################
52+
# Configuration of container clusters templates for OpenStack.
53+
54+
# List of clusters templates in the openstack project. Format is as required by the
55+
# stackhpc.os-container-clusters role.
56+
openstack_container_clusters_templates: []
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
# Configuration of OpenStack authentication variables.
3+
4+
# Cloud authentication type. This should be a string compatible with the
5+
# 'auth_type' argument of most 'os_*' Ansible modules.
6+
openstack_auth_type: "password"
7+
8+
# Cloud authentication parameters. This should be a dict providing items
9+
# compatible with the 'auth' argument of most 'os_*' Ansible modules.
10+
# By default we pull these from the environment of the shell executing Ansible.
11+
openstack_auth:
12+
project_domain_id: "{{ lookup('env', 'OS_PROJECT_DOMAIN_ID') }}"
13+
user_domain_id: "{{ lookup('env', 'OS_USER_DOMAIN_ID') }}"
14+
project_domain_name: "{{ lookup('env', 'OS_PROJECT_DOMAIN_NAME') }}"
15+
user_domain_name: "{{ lookup('env', 'OS_USER_DOMAIN_NAME') }}"
16+
project_id: "{{ lookup('env', 'OS_PROJECT_ID') }}"
17+
project_name: "{{ lookup('env', 'OS_PROJECT_NAME') }}"
18+
username: "{{ lookup('env', 'OS_USERNAME') }}"
19+
password: "{{ lookup('env', 'OS_PASSWORD') }}"
20+
auth_url: "{{ lookup('env', 'OS_AUTH_URL') }}"
21+
22+
openstack_cacert: "{{ lookup('env', 'OS_CACERT') }}"

ansible/group_vars/all/venv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
# Path to create virtualenv in which to install python dependencies.
3+
openstack_venv: "{{ ansible_env.PWD }}/openstack-config-venv"

0 commit comments

Comments
 (0)