From b8dcab08624bfdc4e89a144b82caa68883d1f861 Mon Sep 17 00:00:00 2001
From: Chengcheng Mu <chengcheng.mu@amadeus.com>
Date: Thu, 1 Oct 2015 15:45:45 +0200
Subject: Removed some application specific code like insecure registries, heat
template
---
roles/openshift_master/tasks/main.yml | 9 ---------
roles/openshift_node/tasks/main.yml | 6 ------
2 files changed, 15 deletions(-)
(limited to 'roles')
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 96cc4d9af..88940ec8c 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -8,15 +8,6 @@
- openshift_master_oauth_grant_method in openshift_master_valid_grant_methods
when: openshift_master_oauth_grant_method is defined
-- name: Displaying openshift_master_ha
- debug: var=openshift_master_ha
-
-- name: openshift_master_cluster_password
- debug: var=openshift_master_cluster_password
-
-- name: openshift.master.cluster_defer_ha
- debug: var=openshift.master.cluster_defer_ha
-
- fail:
msg: "openshift_master_cluster_password must be set for multi-master installations"
when: openshift_master_ha | bool and not openshift.master.cluster_defer_ha | bool and openshift_master_cluster_password is not defined
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 7e5ac2b5b..96cd96315 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -73,12 +73,6 @@
dest: /etc/sysconfig/docker
regexp: '^OPTIONS=.*$'
line: "OPTIONS='--insecure-registry={{ openshift.node.portal_net }} \
---insecure-registry=dockerhub.rnd.amadeus.net:5000 \
---insecure-registry=dockerhub.rnd.amadeus.net:5001 \
---insecure-registry=dockerhub.rnd.amadeus.net:5002 \
---add-registry=dockerhub.rnd.amadeus.net:5000 \
---add-registry=dockerhub.rnd.amadeus.net:5001 \
---add-registry=dockerhub.rnd.amadeus.net:5002 \
{% if ansible_selinux and ansible_selinux.status == '''enabled''' %}--selinux-enabled{% endif %}'"
when: docker_check.stat.isreg
notify:
--
cgit v1.2.3