From 7318e26c4f9d694dd5ed58df5927eea73060054d Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Thu, 16 Jun 2016 17:19:42 -0400
Subject: Pull in keynote demo changes

---
 roles/openshift_facts/library/openshift_facts.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'roles/openshift_facts/library')

diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 6fab996b2..f01f3510d 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1776,6 +1776,8 @@ class OpenShiftFacts(object):
             defaults['hosted'] = dict(
                 metrics=dict(
                     deploy=False,
+                    deployer_prefix='registry.access.redhat.com/openshift3/',
+                    deployer_version='3.3.0',
                     duration=7,
                     resolution='10s',
                     storage=dict(
@@ -1791,7 +1793,7 @@ class OpenShiftFacts(object):
                             filesystem='ext4',
                             volumeID='123'),
                         host=None,
-                        access_modes=['ReadWriteMany'],
+                        access_modes=['ReadWriteOnce'],
                         create_pv=True
                     )
                 ),
-- 
cgit v1.2.3


From c0067ca0646c99dc428f09f3e68eacfab683394f Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Mon, 8 Aug 2016 08:39:31 -0400
Subject: add selectors for metrics and logging

---
 roles/openshift_facts/library/openshift_facts.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'roles/openshift_facts/library')

diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index f01f3510d..b67ef491f 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -477,6 +477,14 @@ def set_selectors(facts):
         facts['hosted']['registry'] = {}
     if 'selector' not in facts['hosted']['registry'] or facts['hosted']['registry']['selector'] in [None, 'None']:
         facts['hosted']['registry']['selector'] = selector
+    if 'metrics' not in facts['hosted']:
+        facts['hosted']['metrics'] = {}
+    if 'selector' not in facts['hosted']['metrics'] or facts['hosted']['metrics']['selector'] in [None, 'None']:
+        facts['hosted']['metrics']['selector'] = None
+    if 'logging' not in facts['hosted']:
+        facts['hosted']['logging'] = {}
+    if 'selector' not in facts['hosted']['logging'] or facts['hosted']['logging']['selector'] in [None, 'None']:
+        facts['hosted']['logging']['selector'] = None
 
     return facts
 
-- 
cgit v1.2.3


From 85c6743a011884abfcdb2ded665e46f46023522e Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Wed, 17 Aug 2016 13:54:57 -0400
Subject: Add ability to disable pvc creation

---
 roles/openshift_facts/library/openshift_facts.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'roles/openshift_facts/library')

diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index b67ef491f..bd8010705 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1802,7 +1802,8 @@ class OpenShiftFacts(object):
                             volumeID='123'),
                         host=None,
                         access_modes=['ReadWriteOnce'],
-                        create_pv=True
+                        create_pv=True,
+                        create_pvc=False
                     )
                 ),
                 registry=dict(
@@ -1817,7 +1818,8 @@ class OpenShiftFacts(object):
                             options='*(rw,root_squash)'),
                         host=None,
                         access_modes=['ReadWriteMany'],
-                        create_pv=True
+                        create_pv=True,
+                        create_pvc=True
                     )
                 ),
                 router=dict()
-- 
cgit v1.2.3


From 6765f1f398c1a3b8d72e1a07085c953f5a1ad810 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Fri, 19 Aug 2016 13:53:08 -0400
Subject: Rely on IMAGE_PREFIX and IMAGE_VERSION defaults from the templates
 themselves

---
 roles/openshift_facts/library/openshift_facts.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'roles/openshift_facts/library')

diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index bd8010705..ff4d9c946 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1784,8 +1784,6 @@ class OpenShiftFacts(object):
             defaults['hosted'] = dict(
                 metrics=dict(
                     deploy=False,
-                    deployer_prefix='registry.access.redhat.com/openshift3/',
-                    deployer_version='3.3.0',
                     duration=7,
                     resolution='10s',
                     storage=dict(
-- 
cgit v1.2.3