4e30f51470
This commit updates the openshift templates to deploy openshift 3.9 instead of 3.7. Update the default playbook path to the one expected by openshift-ansible 3.9. Update the default openshift-ansible variables and move them in the template where they belong. They can be overridden individually via the OpenShiftGlobalVariables heat parameter. Disable unbound on the openshift nodes in CI as it is listening on port 53 and is preventing openshift to start its own DNS service. Co-Authored-By: Flavio Percoco <flavio@redhat.com> Depends-On: I6f123cd71a23fb15aaa2005f7397fc98fdaf187a Depends-On: I27ad9d168af575da8c4f5094152c94e2fa03987c Change-Id: Ifc3d25fa590cfba1fa64ed0266c76c9342a7aa4f
44 lines
1.7 KiB
YAML
44 lines
1.7 KiB
YAML
resource_registry:
|
|
OS::TripleO::Services::DisableUnbound: disable-unbound.yaml
|
|
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
|
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
|
OS::TripleO::Services::OpenShift::Master: ../../extraconfig/services/openshift-master.yaml
|
|
OS::TripleO::Services::OpenShift::Worker: ../../extraconfig/services/openshift-worker.yaml
|
|
|
|
|
|
parameter_defaults:
|
|
ControllerServices:
|
|
- OS::TripleO::Services::DisableUnbound
|
|
- OS::TripleO::Services::CACerts
|
|
- OS::TripleO::Services::Docker
|
|
- OS::TripleO::Services::Kernel
|
|
- OS::TripleO::Services::Ntp
|
|
- OS::TripleO::Services::Snmp
|
|
- OS::TripleO::Services::Timezone
|
|
- OS::TripleO::Services::TripleoPackages
|
|
- OS::TripleO::Services::TripleoFirewall
|
|
- OS::TripleO::Services::Sshd
|
|
- OS::TripleO::Services::OpenShift::Master
|
|
- OS::TripleO::Services::OpenShift::Worker
|
|
ComputeServices:
|
|
- OS::TripleO::Services::DisableUnbound
|
|
- OS::TripleO::Services::CACerts
|
|
- OS::TripleO::Services::Docker
|
|
- OS::TripleO::Services::Kernel
|
|
- OS::TripleO::Services::Ntp
|
|
- OS::TripleO::Services::Snmp
|
|
- OS::TripleO::Services::Timezone
|
|
- OS::TripleO::Services::TripleoPackages
|
|
- OS::TripleO::Services::TripleoFirewall
|
|
- OS::TripleO::Services::Sshd
|
|
- OS::TripleO::Services::OpenShift::Worker
|
|
Debug: true
|
|
|
|
OpenShiftGlobalVariables:
|
|
# NOTE(flaper87): Needed for the gate
|
|
openshift_disable_check: package_availability,package_version,disk_availability,docker_storage,memory_availability,docker_image_availability
|
|
|
|
# NOTE(mandre) keep this until overcloud-full has dbus-python
|
|
# https://review.openstack.org/#/c/574674/
|
|
l_install_base_packages: true
|