From 5e0e06bd1ba55b0a8990440c1147ca210495501e Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Wed, 7 Feb 2018 17:12:44 +0100
Subject: [PATCH] Move options out of the OpenShiftMaster template

Some of the options that had been hard-coded in the openshift-master
template should be configuratble in a per-deployment bases. This patch
moves them out into an environment file instead.

Change-Id: I4b6f6180b11f36b1212b9e887365a99b6ae12017
---
 environments/openshift.yaml                | 12 ++++++++++++
 extraconfig/services/openshift-master.yaml |  8 --------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/environments/openshift.yaml b/environments/openshift.yaml
index da63cbb0b1..fd208ecde1 100644
--- a/environments/openshift.yaml
+++ b/environments/openshift.yaml
@@ -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
diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml
index cdfbd8675b..9016c844d1 100644
--- a/extraconfig/services/openshift-master.yaml
+++ b/extraconfig/services/openshift-master.yaml
@@ -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: