diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2016-06-08 16:59:54 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-02-10 10:53:43 +0100 |
| commit | 595f0f307aeb78de499891f21b99057a6e6b17f0 (patch) | |
| tree | 2e4179deabde8c08b8a403cd69ea654fcc18d326 /roles/openshift_master/tasks/systemd_units.yml | |
| parent | fc96d8d22f6c277b599e6e2fa4e9cc06814a9460 (diff) | |
| download | openshift-595f0f307aeb78de499891f21b99057a6e6b17f0.tar.gz openshift-595f0f307aeb78de499891f21b99057a6e6b17f0.tar.bz2 openshift-595f0f307aeb78de499891f21b99057a6e6b17f0.tar.xz openshift-595f0f307aeb78de499891f21b99057a6e6b17f0.zip | |
atomic-openshift: install as a system container
Use use_system_containers=true in the inventory file
alternatively you can select each component as:
use_openvswitch_system_container=true
use_node_system_container=true
use_master_system_container=true
system_images_registry holds the registry from where to fetch system
containers.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/openshift_master/tasks/systemd_units.yml')
| -rw-r--r-- | roles/openshift_master/tasks/systemd_units.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml index 39ea42ab3..4ab98cbbb 100644 --- a/roles/openshift_master/tasks/systemd_units.yml +++ b/roles/openshift_master/tasks/systemd_units.yml @@ -20,14 +20,14 @@ docker pull {{ openshift.master.master_image }}:{{ openshift_image_tag }} register: pull_result changed_when: "'Downloaded newer image' in pull_result.stdout" - when: openshift.common.is_containerized | bool + when: openshift.common.is_containerized | bool and not openshift.common.is_master_system_container | bool # workaround for missing systemd unit files - name: Create the systemd unit files template: 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) + when: openshift.common.is_containerized | bool and (openshift.master.ha is not defined or not openshift.master.ha | bool and not openshift.common.is_master_system_container | bool) register: create_master_unit_file - command: systemctl daemon-reload @@ -132,7 +132,7 @@ dest: "/etc/systemd/system/{{ openshift.common.service_type }}-master.service" 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 + when: openshift.common.is_containerized | bool and openshift.master.ha is defined and not openshift.master.ha | bool and not openshift.common.is_master_system_container | bool - name: Preserve Master Proxy Config options command: grep PROXY /etc/sysconfig/{{ openshift.common.service_type }}-master |