diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-16 11:54:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-16 11:54:03 -0500 |
| commit | ef686396dfdf2cace926a5b226ff1694eb89d005 (patch) | |
| tree | b015095e317f10971dd41a75ac6c7c738b17003a /roles/openshift_master/templates | |
| parent | 15fd42020a0b5fee665c45cd23b9ba3bd152251d (diff) | |
| parent | c37fbea2f717c0343007d8dc79c2dd9e8697adf0 (diff) | |
| download | openshift-ef686396dfdf2cace926a5b226ff1694eb89d005.tar.gz openshift-ef686396dfdf2cace926a5b226ff1694eb89d005.tar.bz2 openshift-ef686396dfdf2cace926a5b226ff1694eb89d005.tar.xz openshift-ef686396dfdf2cace926a5b226ff1694eb89d005.zip | |
Merge pull request #4178 from mtnbikenc/fix-templating
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master/templates')
| -rw-r--r-- | roles/openshift_master/templates/atomic-openshift-master.service | 23 | ||||
| -rw-r--r-- | roles/openshift_master/templates/origin-master.service | 23 |
2 files changed, 0 insertions, 46 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master.service b/roles/openshift_master/templates/atomic-openshift-master.service deleted file mode 100644 index 02af4dd16..000000000 --- a/roles/openshift_master/templates/atomic-openshift-master.service +++ /dev/null @@ -1,23 +0,0 @@ -[Unit] -Description=Atomic OpenShift Master -Documentation=https://github.com/openshift/origin -After=network-online.target -After=etcd.service -Before=atomic-openshift-node.service -Requires=network-online.target - -[Service] -Type=notify -EnvironmentFile=/etc/sysconfig/atomic-openshift-master -Environment=GOTRACEBACK=crash -ExecStart=/usr/bin/openshift start master --config=${CONFIG_FILE} $OPTIONS -LimitNOFILE=131072 -LimitCORE=infinity -WorkingDirectory=/var/lib/origin/ -SyslogIdentifier=atomic-openshift-master -Restart=always -RestartSec=5s - -[Install] -WantedBy=multi-user.target -WantedBy=atomic-openshift-node.service diff --git a/roles/openshift_master/templates/origin-master.service b/roles/openshift_master/templates/origin-master.service deleted file mode 100644 index cf79dda02..000000000 --- a/roles/openshift_master/templates/origin-master.service +++ /dev/null @@ -1,23 +0,0 @@ -[Unit] -Description=Origin Master Service -Documentation=https://github.com/openshift/origin -After=network-online.target -After=etcd.service -Before=origin-node.service -Requires=network-online.target - -[Service] -Type=notify -EnvironmentFile=/etc/sysconfig/origin-master -Environment=GOTRACEBACK=crash -ExecStart=/usr/bin/openshift start master --config=${CONFIG_FILE} $OPTIONS -LimitNOFILE=131072 -LimitCORE=infinity -WorkingDirectory=/var/lib/origin/ -SyslogIdentifier=origin-master -Restart=always -RestartSec=5s - -[Install] -WantedBy=multi-user.target -WantedBy=origin-node.service |