Skip to content

Commit

Permalink
adoption uni01alpha - ironic ServiceNetMap
Browse files Browse the repository at this point in the history
Set the ServiceNetMap overrides for the ironic service.

Also:
* Make the name_lower for the ironic network all lowercase.
* Add ironic network on controllers in roles_data.
* Add OS::TripleO::Controller::Ports::IronicPort in resource registry.
* Add ironic_vip
  • Loading branch information
hjensas committed Dec 18, 2024
1 parent 2264626 commit cdf0a6d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
5 changes: 5 additions & 0 deletions scenarios/uni01alpha/config_download.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ resource_registry:
OS::TripleO::Controller::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_internal_api.yaml
OS::TripleO::Controller::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage.yaml
OS::TripleO::Controller::Ports::TenantPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_tenant.yaml
OS::TripleO::Controller::Ports::IronicPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_ironic.yaml
OS::TripleO::Networker::Ports::InternalApiPort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_internal_api.yaml
OS::TripleO::Networker::Ports::StoragePort: /usr/share/openstack-tripleo-heat-templates/network/ports/deployed_storage.yaml
OS::TripleO::Services::CeilometerAgentCentral: /usr/share/openstack-tripleo-heat-templates/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
Expand Down Expand Up @@ -96,3 +97,7 @@ parameter_defaults:
- ip_range: 172.20.1.220,172.20.1.229
osp-controller-uni01alpha-2:
- ip_range: 172.20.1.230,172.20.1.239
ServiceNetMap:
IronicApiNetwork: ironic
IronicNetwork: ironic
IronicInspectorNetwork: ironic
3 changes: 2 additions & 1 deletion scenarios/uni01alpha/network_data.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@

- name: Ironic
mtu: 1500
name_lower: Ironic
vip: true
name_lower: ironic
dns_domain: ironic.{{ cloud_domain }}.
subnets:
ironic_subnet:
Expand Down
2 changes: 2 additions & 0 deletions scenarios/uni01alpha/roles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
subnet: storage_subnet
Tenant:
subnet: tenant_subnet
Ironic:
subnet: ironic_subnet
# For systems with both IPv4 and IPv6, you may specify a gateway network for
# each, such as ['ControlPlane', 'External']
default_route_networks: ['ControlPlane']
Expand Down
4 changes: 4 additions & 0 deletions scenarios/uni01alpha/vips_data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@
ip_address: 192.168.122.100
subnet: ctlplane-subnet
dns_name: overcloud
- name: ironic_vip
network: ironic
ip_address: 172.20.1.99
subnet: ironic_subnet

0 comments on commit cdf0a6d

Please sign in to comment.