diff --git a/inventory/group_vars/os-stg b/inventory/group_vars/os-stg index 92656a93d5..7e31e1985c 100644 --- a/inventory/group_vars/os-stg +++ b/inventory/group_vars/os-stg @@ -1,5 +1,5 @@ --- host_group: os baseiptables: False -no_http2: True +no_http2: False nm_controlled_resolv: True diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 9b0ec44489..a2332fb4ba 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -102,9 +102,9 @@ openshift_release: "v3.9", openshift_ansible_path: "/root/openshift-ansible", openshift_ansible_playbook: "playbooks/deploy_cluster.yml", - openshift_ansible_version: "openshift-ansible-3.9.29-1", + openshift_ansible_version: "openshift-ansible-3.9.30-1", openshift_ansible_ssh_user: root, - openshift_ansible_install_examples: true, + openshift_ansible_install_examples: false, openshift_ansible_containerized_deploy: false, openshift_cluster_masters_group: "os-masters-stg", openshift_cluster_nodes_group: "os-nodes-stg", @@ -119,6 +119,8 @@ openshift_api_port: 443, openshift_console_port: 443, openshift_shared_infra: true, + openshift_ansible_use_crio: true, + openshift_ansible_use_crio_only: false, when: env == 'staging', tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] } diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 index d2c5307816..f84f27b353 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 @@ -105,6 +105,18 @@ openshift_install_examples={{openshift_ansible_install_examples}} #openshift_docker_blocked_registries=registry.hacker.com # Disable pushing to dockerhub #openshift_docker_disable_push_dockerhub=True +# Install and run cri-o. +openshift_use_crio={{ openshift_ansible_use_crio }} +openshift_use_crio_only={{ openshift_ansible_crio_only }} +# The following two variables are used when openshift_use_crio is True +# and cleans up after builds that pass through docker. When openshift_use_crio is True +# these variables are set to the defaults shown. You may override them here. +# NOTE: You will still need to tag crio nodes with your given label(s)! +# Enable docker garbage collection when using cri-o +#openshift_crio_enable_docker_gc=True +# Node Selectors to run the garbage collection +#openshift_crio_docker_gc_node_selector={'runtime': 'cri-o'} + # Use Docker inside a System Container. Note that this is a tech preview and should # not be used to upgrade! # The following options for docker are ignored: @@ -414,12 +426,21 @@ openshift_master_default_subdomain={{openshift_app_subdomain}} # NFS volume must already exist with path "nfs_directory/_volume_name" on # the storage_host. For example, the remote volume path using these # options would be "nfs.example.com:/exports/registry" +{% if env == "staging" %} +openshift_hosted_registry_storage_kind=nfs +openshift_hosted_registry_storage_access_modes=['ReadWriteMany'] +openshift_hosted_registry_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com +openshift_hosted_registry_storage_nfs_directory=/ +openshift_hosted_registry_storage_volume_name=openshift_stg_01 +openshift_hosted_registry_storage_volume_size=10Gi +{% else %} #openshift_hosted_registry_storage_kind=nfs #openshift_hosted_registry_storage_access_modes=['ReadWriteMany'] -#openshift_hosted_registry_storage_host=nfs.example.com -#openshift_hosted_registry_storage_nfs_directory=/exports -#openshift_hosted_registry_storage_volume_name=registry +#openshift_hosted_registry_storage_host=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com +#openshift_hosted_registry_storage_nfs_directory=/ +#openshift_hosted_registry_storage_volume_name=openshift_stg_01 #openshift_hosted_registry_storage_volume_size=10Gi +{% endif %} # # Openstack # Volume must already exist.