diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-08-25 00:10:54 -0400 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-09-06 13:59:38 -0400 |
commit | 8bf97723ceaca02fe12b86466f8383aa211ead5e (patch) | |
tree | e73adc1d43d5a07b0e6c941d8e555919e3266fed /roles/openshift_master/templates/native-cluster | |
parent | b5cf769b97691d75e07d1e0e3b29ecbc31ba32ea (diff) | |
download | openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.gz openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.bz2 openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.xz openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.zip |
Remove openshift-common
Most of this role's purpose was to set facts. The vast majority
of these facts were simply redefining user-supplied variables.
This commit also removes various artifacts leftover from
previous versions, as well as variables that seem to be
entirely unused.
Diffstat (limited to 'roles/openshift_master/templates/native-cluster')
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2 index 0e78d2d23..02bfd6f62 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2 @@ -13,7 +13,7 @@ Environment=GOTRACEBACK=crash ExecStart=/usr/bin/openshift start master api --config=${CONFIG_FILE} $OPTIONS LimitNOFILE=131072 LimitCORE=infinity -WorkingDirectory={{ openshift.common.data_dir }} +WorkingDirectory={{ r_openshift_master_data_dir }} SyslogIdentifier=atomic-openshift-master-api Restart=always RestartSec=5s diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 index 94928f88c..e284413f7 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 @@ -17,7 +17,7 @@ Environment=GOTRACEBACK=crash ExecStart=/usr/bin/openshift start master controllers --config=${CONFIG_FILE} $OPTIONS LimitNOFILE=131072 LimitCORE=infinity -WorkingDirectory={{ openshift.common.data_dir }} +WorkingDirectory={{ r_openshift_master_data_dir }} SyslogIdentifier={{ openshift.common.service_type }}-master-controllers Restart=always RestartSec=5s |