Skip to content

Commit 4978998

Browse files
jamepark4jamepark4
committed
Update uni05 nodesets to allow for new cell
1 parent e2b8bca commit 4978998

File tree

2 files changed

+146
-0
lines changed

2 files changed

+146
-0
lines changed

‎roles/ci_gen_kustomize_values/templates/uni05epsilon/edpm-nodeset-values/values.yaml.j2‎

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

‎roles/ci_gen_kustomize_values/templates/uni05epsilon/edpm-nodeset2-values/values.yaml.j2‎

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

0 commit comments

Comments
 (0)