Skip to content

Commit eab8350

Browse files
jamepark4openshift-merge-bot[bot]
jamepark4
authored and
openshift-merge-bot[bot]
committed
Add nova multiplecells nodeset templates
1 parent 9c95009 commit eab8350

File tree

2 files changed

+138
-0
lines changed

2 files changed

+138
-0
lines changed

‎roles/ci_gen_kustomize_values/templates/nova-three-cells/edpm-nodeset-values/values.yaml.j2

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
---
2+
# source: nova-three-cells/edpm-nodeset-values/values.yaml.j2
3+
{% set _ipv = cifmw_ci_gen_kustomize_values_ip_version_var_mapping %}
4+
{% set instances_names = [] %}
5+
{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
6+
{% set _original_nodes = _original_nodeset.nodes | default({}) %}
7+
{% set _original_services = _original_nodeset['services'] | default([]) %}
8+
{% for _inst in cifmw_networking_env_definition.instances.keys() %}
9+
{% if _inst.startswith('compute') %}
10+
{% set _ = instances_names.append(_inst) %}
11+
{% endif %}
12+
{% endfor %}
13+
{% set inst_stop_idx = (instances_names | length) // 2 %}
14+
{% set nodeset_one_instances = instances_names[:inst_stop_idx] %}
15+
data:
16+
ssh_keys:
17+
authorized: {{ cifmw_ci_gen_kustomize_values_ssh_authorizedkeys | b64encode }}
18+
private: {{ cifmw_ci_gen_kustomize_values_ssh_private_key | b64encode }}
19+
public: {{ cifmw_ci_gen_kustomize_values_ssh_public_key | b64encode }}
20+
nova:
21+
migration:
22+
ssh_keys:
23+
private: {{ cifmw_ci_gen_kustomize_values_migration_priv_key | b64encode }}
24+
public: {{ cifmw_ci_gen_kustomize_values_migration_pub_key | b64encode }}
25+
nodeset:
26+
ansible:
27+
ansibleUser: "zuul"
28+
ansibleVars:
29+
edpm_fips_mode: "{{ 'enabled' if cifmw_fips_enabled|default(false)|bool else 'check' }}"
30+
timesync_ntp_servers:
31+
- hostname: "{{ cifmw_ci_gen_kustomize_values_ntp_srv | default('pool.ntp.org') }}"
32+
edpm_network_config_os_net_config_mappings:
33+
{% for instance in nodeset_one_instances %}
34+
edpm-{{ instance }}:
35+
{% if hostvars[instance] is defined %}
36+
nic1: "{{ hostvars[instance][_ipv.ansible_default_ipvX].macaddress }}"
37+
{% endif %}
38+
nic2: "{{ cifmw_networking_env_definition.instances[instance].networks.ctlplane.mac_addr }}"
39+
{% endfor %}
40+
{% if cifmw_ci_gen_kustomize_values_sshd_ranges | default([]) | length > 0 %}
41+
edpm_sshd_allowed_ranges:
42+
{% for range in cifmw_ci_gen_kustomize_values_sshd_ranges %}
43+
- "{{ range }}"
44+
{% endfor %}
45+
{% endif %}
46+
nodes:
47+
{% for instance in nodeset_one_instances %}
48+
edpm-{{ instance }}:
49+
ansible:
50+
host: {{ cifmw_networking_env_definition.instances[instance].networks.ctlplane[_ipv.ip_vX] }}
51+
hostName: {{ instance }}
52+
networks:
53+
{% for net in cifmw_networking_env_definition.instances[instance].networks.keys() %}
54+
- name: {{ net }}
55+
subnetName: subnet1
56+
fixedIP: {{ cifmw_networking_env_definition.instances[instance].networks[net][_ipv.ip_vX] }}
57+
{% if net is match('ctlplane') %}
58+
defaultRoute: true
59+
{% endif %}
60+
{% endfor %}
61+
{% endfor %}
62+
{% if ('repo-setup' not in _original_services) and
63+
('repo-setup' in ci_gen_kustomize_edpm_nodeset_predeployed_services) %}
64+
services:
65+
- "repo-setup"
66+
{% for svc in _original_services %}
67+
- "{{ svc }}"
68+
{% endfor %}
69+
{% endif %}

‎roles/ci_gen_kustomize_values/templates/nova-three-cells/edpm-nodeset2-values/values.yaml.j2

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
---
2+
# source: nova-three-cells/edpm-nodeset2-values/values.yaml.j2
3+
{% set _ipv = cifmw_ci_gen_kustomize_values_ip_version_var_mapping %}
4+
{% set instances_names = [] %}
5+
{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
6+
{% set _original_nodes = _original_nodeset.nodes | default({}) %}
7+
{% set _original_services = _original_nodeset['services'] | default([]) %}
8+
{% for _inst in cifmw_networking_env_definition.instances.keys() %}
9+
{% if _inst.startswith('compute') %}
10+
{% set _ = instances_names.append(_inst) %}
11+
{% endif %}
12+
{% endfor %}
13+
{% set inst_stop_idx = (instances_names | length) // 2 %}
14+
{% set nodeset_two_instances = instances_names[inst_stop_idx:] %}
15+
data:
16+
ssh_keys:
17+
authorized: {{ cifmw_ci_gen_kustomize_values_ssh_authorizedkeys | b64encode }}
18+
private: {{ cifmw_ci_gen_kustomize_values_ssh_private_key | b64encode }}
19+
public: {{ cifmw_ci_gen_kustomize_values_ssh_public_key | b64encode }}
20+
nova:
21+
migration:
22+
ssh_keys:
23+
private: {{ cifmw_ci_gen_kustomize_values_migration_priv_key | b64encode }}
24+
public: {{ cifmw_ci_gen_kustomize_values_migration_pub_key | b64encode }}
25+
nodeset:
26+
ansible:
27+
ansibleUser: "zuul"
28+
ansibleVars:
29+
edpm_fips_mode: "{{ 'enabled' if cifmw_fips_enabled|default(false)|bool else 'check' }}"
30+
timesync_ntp_servers:
31+
- hostname: "{{ cifmw_ci_gen_kustomize_values_ntp_srv | default('pool.ntp.org') }}"
32+
edpm_network_config_os_net_config_mappings:
33+
{% for instance in nodeset_two_instances %}
34+
edpm-{{ instance }}:
35+
{% if hostvars[instance] is defined %}
36+
nic1: "{{ hostvars[instance][_ipv.ansible_default_ipvX].macaddress }}"
37+
{% endif %}
38+
nic2: "{{ cifmw_networking_env_definition.instances[instance].networks.ctlplane.mac_addr }}"
39+
{% endfor %}
40+
{% if cifmw_ci_gen_kustomize_values_sshd_ranges | default([]) | length > 0 %}
41+
edpm_sshd_allowed_ranges:
42+
{% for range in cifmw_ci_gen_kustomize_values_sshd_ranges %}
43+
- "{{ range }}"
44+
{% endfor %}
45+
{% endif %}
46+
nodes:
47+
{% for instance in nodeset_two_instances %}
48+
edpm-{{ instance }}:
49+
ansible:
50+
host: {{ cifmw_networking_env_definition.instances[instance].networks.ctlplane[_ipv.ip_vX] }}
51+
hostName: {{ instance }}
52+
networks:
53+
{% for net in cifmw_networking_env_definition.instances[instance].networks.keys() %}
54+
- name: {{ net }}
55+
subnetName: subnet1
56+
fixedIP: {{ cifmw_networking_env_definition.instances[instance].networks[net][_ipv.ip_vX] }}
57+
{% if net is match('ctlplane') %}
58+
defaultRoute: true
59+
{% endif %}
60+
{% endfor %}
61+
{% endfor %}
62+
{% if ('repo-setup' not in _original_services) and
63+
('repo-setup' in ci_gen_kustomize_edpm_nodeset_predeployed_services) %}
64+
services:
65+
- "repo-setup"
66+
{% for svc in _original_services %}
67+
- "{{ svc }}"
68+
{% endfor %}
69+
{% endif %}

0 commit comments

Comments
 (0)