Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new cidr const and remove dep on network fact #896

Merged
merged 2 commits into from
Jun 3, 2024
Merged

Add new cidr const and remove dep on network fact #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e031b85
add new cidr const and remove dep on network fact
TorLdre Feb 2, 2024
928080b
add cidr constant for vagrant
TorLdre Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions hieradata/bgo/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ netcfg_trp_net_c6: '172.18.6'
netcfg_trp_net_c7: '172.18.7'
netcfg_trp_netmask: '255.255.248.0'
netcfg_trp_netmask6: '64'
netcfg_trp_cidr4: '21'
netcfg_oob_gateway: '172.17.0.10'
netcfg_oob_netpart: '172.17.0'
netcfg_oob_netmask: '255.255.248.0'
Expand Down
2 changes: 1 addition & 1 deletion hieradata/common/roles/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ profile::virtualization::libvirt::firewall_extras:
dport: 5900-5999

profile::network::services::ntp_server: true
chrony::queryhosts: [ "%{hiera('netcfg_mgmt_netpart')}.0/%{::cidr_mgmt1}", ] # allow clients to query ntp service
chrony::queryhosts: [ "%{hiera('netcfg_mgmt_netpart')}.0/%{hiera('netcfg_trp_cidr4')}", ] # allow clients to query ntp service

profile::virtualization::libvirt::networks:
directnet:
Expand Down
1 change: 1 addition & 0 deletions hieradata/local1/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ netcfg_trp_gateway: '172.31.12.1'
netcfg_trp_gateway6: 'fd00::1'
netcfg_trp_netpart6: 'fd00'
netcfg_trp_netmask6: '64'
netcfg_trp_cidr4: '24'
netcfg_trp_net_c0: '172.31.12'
netcfg_trp_net_c1: '172.31.13'
netcfg_trp_net_c2: '172.31.14'
Expand Down
1 change: 1 addition & 0 deletions hieradata/local2/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ netcfg_trp_gateway: '172.31.13.1'
netcfg_trp_gateway6: 'fd00::1'
netcfg_trp_netpart6: 'fd00'
netcfg_trp_netmask6: '64'
netcfg_trp_cidr4: '24'
netcfg_trp_net_c0: '172.31.13'
netcfg_trp_net_c1: '172.31.14'
netcfg_trp_net_c2: '172.31.15'
Expand Down
1 change: 1 addition & 0 deletions hieradata/local3/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ netcfg_trp_gateway: '172.31.12.1'
netcfg_trp_gateway6: 'fd00::1'
netcfg_trp_netpart6: 'fd00'
netcfg_trp_netmask6: '64'
netcfg_trp_cidr4: '24'
netcfg_trp_net_c0: '172.31.12'
netcfg_trp_net_c1: '172.31.13'
netcfg_trp_net_c2: '172.31.14'
Expand Down
1 change: 1 addition & 0 deletions hieradata/osl/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ netcfg_trp_net_c6: '172.18.38'
netcfg_trp_net_c7: '172.18.39'
netcfg_trp_netmask: '255.255.248.0'
netcfg_trp_netmask6: '64'
netcfg_trp_cidr4: '21'
netcfg_oob_gateway: '172.17.32.10'
netcfg_oob_netpart: '172.17.32'
netcfg_oob_netmask: '255.255.248.0'
Expand Down
1 change: 1 addition & 0 deletions hieradata/test01/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ netcfg_trp_net_c6: '172.30.6'
netcfg_trp_net_c7: '172.30.7'
netcfg_trp_netmask: '255.255.248.0'
netcfg_trp_netmask6: '64'
netcfg_trp_cidr4: '21'
netcfg_ceph_netpart: '172.29.0'
netcfg_ceph_netmask: '255.255.248.0'
netcfg_live_netpart: '172.31.0'
Expand Down
1 change: 1 addition & 0 deletions hieradata/test02/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ netcfg_trp_net_c6: '172.30.38'
netcfg_trp_net_c7: '172.30.39'
netcfg_trp_netmask: '255.255.255.0'
netcfg_trp_netmask6: '64'
netcfg_trp_cidr4: '24'
netcfg_live_netpart: '172.30.32'
netcfg_live_netmask: '255.255.255.0'
netcfg_dns_mgmt_server1: '172.28.32.10'
Expand Down
1 change: 1 addition & 0 deletions hieradata/vagrant/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ netcfg_mgmt_net_c7: '172.31.7'
netcfg_trp_gateway: '172.31.8.1'
netcfg_trp_netpart: '172.31.8'
netcfg_trp_netmask: '255.255.255.0'
netcfg_trp_cidr4: '24'
netcfg_trp_net_c0: '172.31.8'
netcfg_trp_net_c1: '172.31.9'
netcfg_trp_net_c2: '172.31.10'
Expand Down