summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-01 15:45:45 +0200
committerChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-01 15:45:45 +0200
commitb8dcab08624bfdc4e89a144b82caa68883d1f861 (patch)
treeef0056ba5d90c5a3b58cf2b285d4e84bd53d4b99
parent9229927a98389f0dae2abb51e1df971f9457afb3 (diff)
downloadopenshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.gz
openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.bz2
openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.xz
openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.zip
Removed some application specific code like insecure registries, heat template
-rw-r--r--playbooks/openstack/openshift-cluster/files/heat_stack.yaml12
-rw-r--r--roles/openshift_master/tasks/main.yml9
-rw-r--r--roles/openshift_node/tasks/main.yml6
3 files changed, 3 insertions, 24 deletions
diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
index cd2636c9c..40e4ab22c 100644
--- a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
+++ b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
@@ -88,12 +88,6 @@ parameters:
label: Infra flavor
description: Flavor of the infra node servers
- key_pair:
- type: string
- label: Key name
- description: Name of the key
-
-
outputs:
master_names:
@@ -297,7 +291,7 @@ resources:
type: master
image: { get_param: master_image }
flavor: { get_param: master_flavor }
- key_name: { get_param: key_pair }
+ key_name: { get_resource: keypair }
net: { get_resource: net }
subnet: { get_resource: subnet }
secgrp:
@@ -329,7 +323,7 @@ resources:
subtype: compute
image: { get_param: node_image }
flavor: { get_param: node_flavor }
- key_name: { get_param: key_pair }
+ key_name: { get_resource: keypair }
net: { get_resource: net }
subnet: { get_resource: subnet }
secgrp:
@@ -361,7 +355,7 @@ resources:
subtype: infra
image: { get_param: infra_image }
flavor: { get_param: infra_flavor }
- key_name: { get_param: key_pair }
+ key_name: { get_resource: keypair }
net: { get_resource: net }
subnet: { get_resource: subnet }
secgrp:
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: