openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Move options out of the OpenShiftMaster template"

This commit is contained in:
Zuul 2018-02-08 13:31:25 +00:00 committed by Gerrit Code Review
parent 7b5e01c292 5e0e06bd1b
commit 49d8f4ea76
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
environments/openshift.yaml
View File

@ -2,3 +2,15 @@ resource_registry:
OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
OS::TripleO::Services::OpenShift::Worker: ../extraconfig/services/openshift-worker.yaml
OS::TripleO::Services::OpenShift::Master: ../extraconfig/services/openshift-master.yaml
parameter_defaults:
OpenShiftGlobalVariables:
openshift_release: '3.7'
openshift_image_tag: v3.7.1
enable_excluders: false
skip_ovs_svc_handlers: true
openshift_deployment_type: origin
openshift_docker_selinux_enabled: false
osm_etcd_image: "registry.fedoraproject.org/f27/etcd"
# NOTE(flaper87): Needed for the gate
openshift_disable_check: disk_availability,docker_storage,memory_availability,docker_image_availability

8
extraconfig/services/openshift-master.yaml
View File

@ -107,14 +107,6 @@ outputs:
containerized: true
openshift_master_cluster_method: native
openshift_use_dnsmasq: true
openshift_deployment_type: origin
openshift_release: '3.7'
openshift_image_tag: v3.7.1
enable_excluders: false
openshift_docker_selinux_enabled: false
osm_etcd_image: "registry.fedoraproject.org/f27/etcd"
# NOTE(flaper87): Needed for the gate
openshift_disable_check: disk_availability,docker_storage,memory_availability,docker_image_availability
- name: set openshift global vars fact
set_fact: