summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-07-15 15:50:31 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-07-25 12:16:16 -0300
commit31707737a5473bb5cf6545b6675b192a64a913c7 (patch)
tree0164ca7dfec4e4012b86ad1824887562191e9c7a /roles
parentd0c75ba21ba84a9df4a6cd12f02ce335ea4f9427 (diff)
downloadopenshift-31707737a5473bb5cf6545b6675b192a64a913c7.tar.gz
openshift-31707737a5473bb5cf6545b6675b192a64a913c7.tar.bz2
openshift-31707737a5473bb5cf6545b6675b192a64a913c7.tar.xz
openshift-31707737a5473bb5cf6545b6675b192a64a913c7.zip
Introduce 1.3/3.3 upgrade path.
Refactored the 3.2 upgrade common files out to a path that does not indicate they are strictly for 3.2. 3.3 upgrade then becomes a relatively small copy of the byo entry point, all calling the same code as 3.2 upgrade. Thus far there are no known 3.3 specific upgrade tasks. In future we will likely want to allow hooks out to version specific pre/upgrade/post tasks. Also fixes a bug where the handlers were not restarting nodes/openvswitch containers doing upgrades, due to a change in Ansible 2+.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master/tasks/systemd_units.yml8
-rw-r--r--roles/openshift_master/templates/master_docker/master.docker.service.j2 (renamed from roles/openshift_master/templates/docker/master.docker.service.j2)0
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml
index 458b56fd1..0c0c7e61e 100644
--- a/roles/openshift_master/tasks/systemd_units.yml
+++ b/roles/openshift_master/tasks/systemd_units.yml
@@ -16,7 +16,7 @@
# workaround for missing systemd unit files
- name: Create the systemd unit files
template:
- src: "docker/master.docker.service.j2"
+ src: "master_docker/master.docker.service.j2"
dest: "{{ containerized_svc_dir }}/{{ openshift.common.service_type }}-master.service"
when: openshift.common.is_containerized | bool and (openshift.master.ha is not defined or not openshift.master.ha | bool)
register: create_master_unit_file
@@ -84,12 +84,12 @@
line: "{{ item }}"
with_items: "{{ master_controllers_proxy.stdout_lines | default([]) }}"
when: openshift.master.ha is defined and openshift.master.ha | bool and openshift_master_cluster_method == "native"
- and master_controllers_proxy.rc == 0 and 'http_proxy' not in openshift.common and 'https_proxy' not in openshift.common
+ and master_controllers_proxy.rc == 0 and 'http_proxy' not in openshift.common and 'https_proxy' not in openshift.common
- name: Install Master docker service file
template:
dest: "/etc/systemd/system/{{ openshift.common.service_type }}-master.service"
- src: docker/master.docker.service.j2
+ src: master_docker/master.docker.service.j2
register: install_result
when: openshift.common.is_containerized | bool and openshift.master.ha is defined and not openshift.master.ha | bool
@@ -112,4 +112,4 @@
dest: /etc/sysconfig/{{ openshift.common.service_type }}-master
line: "{{ item }}"
with_items: "{{ master_proxy.stdout_lines | default([]) }}"
- when: master_proxy.rc == 0 and 'http_proxy' not in openshift.common and 'https_proxy' not in openshift.common \ No newline at end of file
+ when: master_proxy.rc == 0 and 'http_proxy' not in openshift.common and 'https_proxy' not in openshift.common
diff --git a/roles/openshift_master/templates/docker/master.docker.service.j2 b/roles/openshift_master/templates/master_docker/master.docker.service.j2
index 97f698b68..97f698b68 100644
--- a/roles/openshift_master/templates/docker/master.docker.service.j2
+++ b/roles/openshift_master/templates/master_docker/master.docker.service.j2