canonical/cpe-deployments
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

FCE integration work + focal extras

Browse Source
This commit is contained in:
Arif Ali 2022-01-25 13:39:17 +00:00
parent 452724989a
commit 4d3720aed8
Signed by: arif
GPG Key ID: 369608FBA1353A70
6 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/dnsresources.yaml
View File

@ -22,6 +22,8 @@
ip_addresses: 10.0.1.220
- fqdn: vault-internal.example.com
ip_addresses: 10.0.1.221
- fqdn: placement-internal.example.com
ip_addresses: 10.0.1.223
# This record needs to be created manually after the creation of the Nagios VM
#- fqdn: nagios-internal.example.com
# ip_addresses: 10.0.1.63
@ -52,3 +54,5 @@
ip_addresses: 10.0.1.220
- fqdn: vault.example.com
ip_addresses: 10.0.1.221
- fqdn: placement.example.com
ip_addresses: 10.0.1.223

2
config/juju_deploy_focal.sh
View File

@ -7,7 +7,7 @@ juju model-config juju-model-default.yaml
juju model-config default-series=${series}
juju deploy ./bundle_${series}.yaml \
--overlay ./overlays/ovs.yaml \
--overlay ./overlays/ovs_${series}.yaml \
--overlay ./overlays/hostnames.yaml \
--overlay ./overlays/hostnames_${series}.yaml \
--overlay ./overlays/ldap.yaml \

12
config/master.yaml
View File

@ -18,6 +18,7 @@ layers:
tweaks:
- nobond
- nobridge
- nomaasha
maas_vip: 192.168.1.22
postgresql_vip: 192.168.1.22
package_repositories: []
@ -27,11 +28,22 @@ layers:
dnssec_validation: 'no'
upstream_dns:
- 192.168.1.13
- 192.168.1.9
ntp_servers:
- 0.uk.pool.ntp.org
kernel_opts:
- console=tty0
- console=ttyS0,115200n8
- elevator=noop
- intel_iommu=on
- iommu=pt
- debug
- nosplash
- scsi_mod.use_blk_mq=1
- dm_mod.use_blk_mq=1
- enable_mtrr_cleanup
- mtrr_spare_reg_nr=1
- systemd.log_level=info
maas_boot_source_selections:
- release: 'focal'
arches: ['amd64']

12
config/networks.yaml
View File

@ -27,7 +27,7 @@ fabrics:
# 63-254: containers
dhcp:
start_ip: 10.0.1.1
end_ip: 10.0.1.9
end_ip: 10.0.1.99
type: dynamic
openstack-vips:
start_ip: 10.0.1.211
@ -52,7 +52,7 @@ fabrics:
reserved:
maas:
start_ip: 10.0.2.1
end_ip: 10.0.2.49
end_ip: 10.0.2.99
type: dynamic
servers:
start_ip: 10.0.2.241
@ -67,7 +67,7 @@ fabrics:
reserved:
maas:
start_ip: 10.0.3.1
end_ip: 10.0.3.49
end_ip: 10.0.3.99
type: dynamic
servers:
start_ip: 10.0.3.241
@ -82,7 +82,7 @@ fabrics:
reserved:
maas:
start_ip: 10.0.4.1
end_ip: 10.0.4.49
end_ip: 10.0.4.99
type: dynamic
servers:
start_ip: 10.0.4.241
@ -97,7 +97,7 @@ fabrics:
reserved:
maas:
start_ip: 10.0.5.1
end_ip: 10.0.5.49
end_ip: 10.0.5.99
type: dynamic
servers:
start_ip: 10.0.5.241
@ -112,7 +112,7 @@ fabrics:
reserved:
maas:
start_ip: 10.0.6.1
end_ip: 10.0.6.49
end_ip: 10.0.6.99
type: dynamic
servers:
start_ip: 10.0.6.241

12
config/nodes.yaml
View File

@ -20,5 +20,17 @@
# bmc_power_boot_type: efi
# zone: asrock03
as1-maas-node-01:
power_type: virsh
zone: asrock01
bmc_address: qemu+ssh://virsh@10.0.1.241/system
power_id: as1-maas-node-01
as2-maas-node-01:
power_type: virsh
zone: asrock02
bmc_address: qemu+ssh://virsh@10.0.1.242/system
power_id: as2-maas-node-01
as3-maas-node-01:
power_type: virsh
zone: asrock03
bmc_address: qemu+ssh://virsh@10.0.1.243/system
power_id: as3-maas-node-01

20
config/overlays/ovs_focal.yaml Normal file
View File

@ -0,0 +1,20 @@
---
variables:
nova-default-filters: &nova-default-filters >-
RetryFilter,AvailabilityZoneFilter,ComputeFilter,
ComputeCapabilitiesFilter,ImagePropertiesFilter,
ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,
DifferentHostFilter,SameHostFilter,AggregateInstanceExtraSpecsFilter,
PciPassthroughFilter,NUMATopologyFilter
vlan-ranges: &vlan-ranges physnet1:350:599
applications:
nova-cloud-controller:
options:
scheduler-default-filters: *nova-default-filters
nova-compute:
options:
aa-profile-mode: complain
neutron-api:
options:
vlan-ranges: *vlan-ranges