From e81bf0e72dc12736b3ea69151123697b69b5240d Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Mon, 30 Nov 2015 11:42:46 -0500
Subject: Enforce connection: local and become: no on all localhost plays

---
 playbooks/common/openshift-master/config.yml  | 8 +++++---
 playbooks/common/openshift-master/service.yml | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'playbooks/common/openshift-master')

diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 43e7836b3..b06a0d132 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -70,7 +70,7 @@
 - name: Create temp directory for syncing certs
   hosts: localhost
   connection: local
-  sudo: false
+  become: no
   gather_facts: no
   tasks:
   - name: Create local temp directory for syncing certs
@@ -207,7 +207,7 @@
 - name: Compute haproxy_backend_servers
   hosts: localhost
   connection: local
-  sudo: false
+  become: no
   gather_facts: no
   tasks:
   - set_fact:
@@ -268,6 +268,8 @@
 
 - name: Parse named certificates
   hosts: localhost
+  connection: local
+  become: no
   vars:
     internal_hostnames: "{{ hostvars[groups.oo_first_master.0].openshift.common.internal_hostnames }}"
     named_certificates: "{{ hostvars[groups.oo_first_master.0].openshift_master_named_certificates | default([]) }}"
@@ -394,7 +396,7 @@
 - name: Delete temporary directory on localhost
   hosts: localhost
   connection: local
-  sudo: false
+  become: no
   gather_facts: no
   tasks:
   - file: name={{ g_master_mktemp.stdout }} state=absent
diff --git a/playbooks/common/openshift-master/service.yml b/playbooks/common/openshift-master/service.yml
index 27e1e66f9..f60c5a2b5 100644
--- a/playbooks/common/openshift-master/service.yml
+++ b/playbooks/common/openshift-master/service.yml
@@ -2,6 +2,8 @@
 - name: Populate g_service_masters host group if needed
   hosts: localhost
   gather_facts: no
+  connection: local
+  become: no
   tasks:
   - fail: msg="new_cluster_state is required to be injected in this playbook"
     when: new_cluster_state is not defined
-- 
cgit v1.2.3


From b1d30491f1581503003646684137bf2c218660ba Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Wed, 9 Dec 2015 15:06:48 -0500
Subject: Remove yum / dnf duplication

---
 playbooks/common/openshift-master/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'playbooks/common/openshift-master')

diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 196cdc8fe..d6d6e1cf4 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -245,7 +245,7 @@
       msg: "openshift_master_session_auth_secrets and openshift_master_encryption_secrets must be equal length"
     when: (openshift_master_session_auth_secrets is defined and openshift_master_session_encryption_secrets is defined) and (openshift_master_session_auth_secrets | length != openshift_master_session_encryption_secrets | length)
   - name: Install OpenSSL package
-    action: "{{ansible_pkg_mgr}} pkg=openssl state=present"
+    action: "{{ ansible_pkg_mgr }} name=openssl state=present"
   - name: Generate session authentication key
     command: /usr/bin/openssl rand -base64 24
     register: session_auth_output
-- 
cgit v1.2.3


From 9fc1e7ac3e066add840be7691a9647f6157afe27 Mon Sep 17 00:00:00 2001
From: John T Skarbek <jtslear@gmail.com>
Date: Thu, 3 Dec 2015 22:37:33 -0500
Subject: Make the install of openshift_examples optional

* Allows us to make it optional to run the role `openshift_examples`
* Defaults to true
---
 playbooks/common/openshift-master/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'playbooks/common/openshift-master')

diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index becd68dbe..a537797b6 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -349,7 +349,8 @@
   roles:
   - role: openshift_master_cluster
     when: openshift_master_ha | bool and openshift.master.cluster_method == "pacemaker"
-  - openshift_examples
+  - role: openshift_examples
+    when: openshift.common.install_examples | bool
   - role: openshift_cluster_metrics
     when: openshift.common.use_cluster_metrics | bool
   - role: openshift_manageiq
-- 
cgit v1.2.3