@@ -10,7 +10,7 @@ Requires=network.target

 Type=notify

 EnvironmentFile=/etc/sysconfig/atomic-openshift-master

 Environment=GOTRACEBACK=crash

-ExecStart=/usr/bin/atomic-enterprise start master --config=${CONFIG_FILE} $OPTIONS

+ExecStart=/usr/bin/openshift start master --config=${CONFIG_FILE} $OPTIONS

 LimitNOFILE=131072

 LimitCORE=infinity

 WorkingDirectory=/var/lib/origin/

@@ -9,7 +9,7 @@ Documentation=https://github.com/openshift/origin

 Type=notify

 EnvironmentFile=/etc/sysconfig/atomic-openshift-node

 Environment=GOTRACEBACK=crash

-ExecStart=/usr/bin/atomic-enterprise start node --config=${CONFIG_FILE} $OPTIONS

+ExecStart=/usr/bin/openshift start node --config=${CONFIG_FILE} $OPTIONS

 LimitNOFILE=65536

 LimitCORE=infinity

 WorkingDirectory=/var/lib/origin/

@@ -308,11 +308,7 @@ fi

 # Create master config and certs if both do not exist

 if [[ ! -e %{_sysconfdir}/origin/master/master-config.yaml &&

      ! -e %{_sysconfdir}/origin/master/ca.crt ]]; then

-%if "%{dist}" == ".el7aos"

-  %{_bindir}/atomic-enterprise start master --write-config=%{_sysconfdir}/origin/master

-%else

   %{_bindir}/openshift start master --write-config=%{_sysconfdir}/origin/master

-%endif

   # Create node configs if they do not already exist

   if ! find %{_sysconfdir}/origin/ -type f -name "node-config.yaml" | grep -E "node-config.yaml"; then

     %{_bindir}/oadm create-node-config --node-dir=%{_sysconfdir}/origin/node/ --node=localhost --hostnames=localhost,127.0.0.1 --node-client-certificate-authority=%{_sysconfdir}/origin/master/ca.crt --signer-cert=%{_sysconfdir}/origin/master/ca.crt --signer-key=%{_sysconfdir}/origin/master/ca.key --signer-serial=%{_sysconfdir}/origin/master/ca.serial.txt --certificate-authority=%{_sysconfdir}/origin/master/ca.crt