summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-11-06 11:36:42 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-11-06 11:36:42 -0500
commit8b3006399a4fbcacd420fb407c02a7504be3d36b (patch)
tree6ae6a9dd2e3f7ec3138f3676f8a1368cf638ad0c /roles
parent941246584a95cc4b5d5619e2b31f75923888f2f6 (diff)
parente5cafe3da31848e12568a6fbd79dfd2193bb72e7 (diff)
downloadopenshift-8b3006399a4fbcacd420fb407c02a7504be3d36b.tar.gz
openshift-8b3006399a4fbcacd420fb407c02a7504be3d36b.tar.bz2
openshift-8b3006399a4fbcacd420fb407c02a7504be3d36b.tar.xz
openshift-8b3006399a4fbcacd420fb407c02a7504be3d36b.zip
Merge remote-tracking branch 'origin/upgradeFix2' into upgradeFix2
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master/tasks/main.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index be77fce4a..35570923c 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -140,22 +140,27 @@
src: atomic-openshift-master-api.service.j2
dest: /usr/lib/systemd/system/{{ openshift.common.service_type }}-master-api.service
force: no
+ when: openshift_master_ha | bool and openshift_master_cluster_method == "native"
- name: Create the controllers service file
template:
src: atomic-openshift-master-controllers.service.j2
dest: /usr/lib/systemd/system/{{ openshift.common.service_type }}-master-controllers.service
force: no
+ when: openshift_master_ha | bool and openshift_master_cluster_method == "native"
- name: Create the api env file
template:
src: atomic-openshift-master-api.j2
dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-api
force: no
+ when: openshift_master_ha | bool and openshift_master_cluster_method == "native"
- name: Create the controllers env file
template:
src: atomic-openshift-master-controllers.j2
dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
force: no
+ when: openshift_master_ha | bool and openshift_master_cluster_method == "native"
- command: systemctl daemon-reload
+ when: openshift_master_ha | bool and openshift_master_cluster_method == "native"
# end workaround for missing systemd unit files
- name: Create session secrets file