diff options
| author | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-01 15:45:45 +0200 |
|---|---|---|
| committer | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-01 15:45:45 +0200 |
| commit | b8dcab08624bfdc4e89a144b82caa68883d1f861 (patch) | |
| tree | ef0056ba5d90c5a3b58cf2b285d4e84bd53d4b99 /roles | |
| parent | 9229927a98389f0dae2abb51e1df971f9457afb3 (diff) | |
| download | openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.gz openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.bz2 openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.tar.xz openshift-b8dcab08624bfdc4e89a144b82caa68883d1f861.zip | |
Removed some application specific code like insecure registries, heat template
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 6 |
2 files changed, 0 insertions, 15 deletions
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: |