openstack/tripleo-heat-templates
Code Issues Proposed changes
d62ed15efa
tripleo-heat-templates/roles/OpenShiftInfra.yaml

31 lines
1.1 KiB
YAML
Raw Normal View History

Move to openshift-ansible 3.10 This patch adds a new role called OpenShiftInfra which is required to define infra nodes. We've been bundling infra nodes with compute and master nodes and they ought to be independent. With the new node label management introduced in openshift-ansible, it sounds like this is a good time for us to unbundle these nodes. Co-Authored-By: Martin André <m.andre@redhat.com> Depends-On: I291b6ac65eaa1a015bca2ee2bc1be90b0ea0aadc Change-Id: I4f8127a9e2d822057f3db8f0974ab1db0698985a
2018-07-13 11:41:57 +02:00
###############################################################################
# Role: OpenShiftInfra #
###############################################################################
- name: OpenShiftInfra
description: |
OpenShiftInfra role, a specialized worker that only runs infra pods.
CountDefault: 1
Refactor openshift services for composable roles Introduce an openshift_node template that serves as base for all openshift services. This reworks the inventory files so that hosts are defined once and made part of the appropriate groups. The master node can now be split from the infra node, or bundled together with the Worker in the all-in-one role. Provide environment files to enable the Master, Worker, Infra or all-in-one role individually. Change-Id: I9ad86185b01c88b609d320e2384c5644bd99bdae
2018-09-03 18:34:43 +02:00
RoleParametersDefault:
OpenShiftNodeGroupName: 'node-config-infra'
Allow to skip docker reconfiguration during stack update When installing OpenShift by means of TripleO, after the initial docker configuration, openshift-ansible also adds several parameters there. Then, if we want to remove a single node, then a stack update is performed, which returns the configuration to its original state. In other words, it removes all parameters added by openshift-ansible, which breaks OpenShift. This commit adds the ability to disable reconfiguration of docker at the time of stack update for all roles associated with OpenShift. Closes-Bug: #1804790 Depends-On: I0bcaeea9cd24ab35a81d8c3d6fc3a384c1e4c3c2 Change-Id: If202be5d27d81672e39cbe21867459d277220e23
2018-11-28 15:59:53 +01:00
DockerSkipUpdateReconfiguration: true
Move to openshift-ansible 3.10 This patch adds a new role called OpenShiftInfra which is required to define infra nodes. We've been bundling infra nodes with compute and master nodes and they ought to be independent. With the new node label management introduced in openshift-ansible, it sounds like this is a good time for us to unbundle these nodes. Co-Authored-By: Martin André <m.andre@redhat.com> Depends-On: I291b6ac65eaa1a015bca2ee2bc1be90b0ea0aadc Change-Id: I4f8127a9e2d822057f3db8f0974ab1db0698985a
2018-07-13 11:41:57 +02:00
tags:
- openshift
networks:
L3 routed networks - subnet fixed_ips (3/3) When using neutron routed networks we need to specify either the subnet or a ip address in the fixed-ips-request when creating neutron ports. a) For the Vip's: Adds VipSubnetMap and VipSubnetMapDefaults parameters in service_net_map.yaml. The two maps are merged, so that the operator can override the subnet where VIP port should be hosted. For example: parameter_defaults: VipSubnetMap: ctlplane: ctlplane-leaf1 InternalApi: internal_api_leaf1 Storage: storage_leaf1 redis: internal_api_leaf1 b) For overcloud node ports: Enrich 'networks' in roles defenition to include both network and subnet data. Changes the list to a map instead of a list of strings. New schema: - name: <role_name> networks: <network_name> subnet: <subnet_name> For backward compatibility a conditional is used to check if the data is a map or not. In either case the internal list of role networks is created as '_role_networks' in the jinja2 templates. When the data is a map, and the map contains the 'subnet' key the subnet specified in roles_data.yaml is used as the subnet in the fixed-ips-reqest when ports are created. If subnet is not set (or role.networks is not a map) the default will be {{network.name_lower}}_subnet. Also, since the fixed_ips request passed to Vip ports are no longer [] by default, the conditinal has been updated to test for 'ip_address' entries in the request. Partial: blueprint tripleo-routed-networks-templates Depends-On: I773a38fd903fe287132151a4d178326a46890969 Change-Id: I77edc82723d00bfece6752b5dd2c79137db93443
2018-07-12 18:27:08 +02:00
InternalApi:
subnet: internal_api_subnet
Storage:
subnet: storage_subnet
Move to openshift-ansible 3.10 This patch adds a new role called OpenShiftInfra which is required to define infra nodes. We've been bundling infra nodes with compute and master nodes and they ought to be independent. With the new node label management introduced in openshift-ansible, it sounds like this is a good time for us to unbundle these nodes. Co-Authored-By: Martin André <m.andre@redhat.com> Depends-On: I291b6ac65eaa1a015bca2ee2bc1be90b0ea0aadc Change-Id: I4f8127a9e2d822057f3db8f0974ab1db0698985a
2018-07-13 11:41:57 +02:00
# For systems with both IPv4 and IPv6, you may specify a gateway network for
# each, such as ['ControlPlane', 'External']
default_route_networks: ['ControlPlane']
ServicesDefault:
Add bootparams service for all roles NIC partitioning requires IOMMU to be enabled on roles using it. By adding the BootParams service to all the roles, we could enable IOMMU selectively by supplying the role specific parameter "KernelArgs". If a role doesn't use NIC Partitioning then "KernelArgs" shall be not be set and backward compatibility would be retained. Change-Id: I2eb078d9860d9a46d6bffd0fe2f799298538bf73
2018-11-14 17:48:21 +05:30
- OS::TripleO::Services::BootParams
Move to openshift-ansible 3.10 This patch adds a new role called OpenShiftInfra which is required to define infra nodes. We've been bundling infra nodes with compute and master nodes and they ought to be independent. With the new node label management introduced in openshift-ansible, it sounds like this is a good time for us to unbundle these nodes. Co-Authored-By: Martin André <m.andre@redhat.com> Depends-On: I291b6ac65eaa1a015bca2ee2bc1be90b0ea0aadc Change-Id: I4f8127a9e2d822057f3db8f0974ab1db0698985a
2018-07-13 11:41:57 +02:00
- OS::TripleO::Services::Docker
Use glusterfs for registry when deploying with CNS The OCP documentation [1] recommends to use a dedicated GlusterFS cluster for the image registry. Let it be the default when deploying with CNS. [1] https://docs.openshift.com/container-platform/3.10/install_config/persistent_storage/persistent_storage_glusterfs.html#install-advanced-installer Change-Id: Ife73d7c50c304cff7cd05e08f74855cb107f3c46
2018-09-27 19:59:07 +02:00
- OS::TripleO::Services::OpenShift::GlusterFS
Add OS::TripleO::Services::Rhsm to OpenShift roles The OpenShift roles should include the OS::TripleO::Services::Rhsm service for Red Hat Subscription Management so that the provisioned nodes can register with a Satellite or CDN. Add the Podman service to OpenShifAllInOne to be more consistent with other roles. Change-Id: I08862635c68eddbb0940863c43867ece1b289ee5
2018-09-28 08:30:45 +02:00
- OS::TripleO::Services::OpenShift::Infra
- OS::TripleO::Services::Podman
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Sshd
Use Timesync service instead of Ntp At the moment the 'OS::TripleO::Services::Timesync' service is synonymous to 'OS::TripleO::Services::Ntp'. Let's use the more generic Timesync service to pick up the new default in the event the value for 'OS::TripleO::Services::Timesync' changes. This better aligns with the rest of the roles. Change-Id: I44f706ce7dd1909ffd3805337fc6d9a5ce6de80f
2018-09-28 08:43:10 +02:00
- OS::TripleO::Services::Timesync
Let openshift-ansible configure the firewall Openshift-ansible already sets the right firewall rules on the provisioned nodes, there is no need to set up (some of) the rules by ourselves. Add the 'OS::TripleO::Services::TripleoFirewall' to all the OpenShift roles so that the operator can still set additional rules if desired. Change-Id: I1e8ca10069c3f1017207abfebb803cb7aa3835a8
2018-09-28 08:49:22 +02:00
- OS::TripleO::Services::TripleoFirewall
Copy Permalink