diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-07 10:57:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 10:57:28 -0400 |
| commit | 6da235f41a31776b1bc253a34dc14a30307e331e (patch) | |
| tree | bda2cc62691a59fb6ac6ed4978fa7f15ec046121 /roles/openshift_master/tasks | |
| parent | aad4ccce7ce6641d3c720507568f6da779a66995 (diff) | |
| parent | 8bf97723ceaca02fe12b86466f8383aa211ead5e (diff) | |
| download | openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.gz openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.bz2 openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.xz openshift-6da235f41a31776b1bc253a34dc14a30307e331e.zip | |
Merge pull request #5208 from mgugino-upstream-stage/remove-openshift_common
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master/tasks')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/systemd_units.yml | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index a06defdb9..121261e94 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -47,9 +47,9 @@ when: - not openshift.common.is_containerized | bool -- name: Create openshift.common.data_dir +- name: Create r_openshift_master_data_dir file: - path: "{{ openshift.common.data_dir }}" + path: "{{ r_openshift_master_data_dir }}" state: directory mode: 0755 owner: root @@ -169,7 +169,7 @@ register: l_already_set - set_fact: - openshift_push_via_dns: "{{ (openshift_use_dnsmasq | default(true) and openshift.common.version_gte_3_6) or (l_already_set.stdout is defined and l_already_set.stdout | match('OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000')) }}" + openshift_push_via_dns: "{{ openshift.common.version_gte_3_6 or (l_already_set.stdout is defined and l_already_set.stdout | match('OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000')) }}" - name: Set fact of all etcd host IPs openshift_facts: diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml index c480d8223..7a918c57e 100644 --- a/roles/openshift_master/tasks/systemd_units.yml +++ b/roles/openshift_master/tasks/systemd_units.yml @@ -10,6 +10,13 @@ openshift_master_config_dir: '/etc/origin/master' when: openshift_master_config_dir is not defined +# This play may be consumed outside the role, we need to ensure that +# r_openshift_master_data_dir is set. +- name: Set r_openshift_master_data_dir if unset + set_fact: + r_openshift_master_data_dir: "{{ openshift_data_dir | default('/var/lib/origin') }}" + when: r_openshift_master_data_dir is not defined + - name: Remove the legacy master service if it exists include: clean_systemd_units.yml |