Merge pull request openshift#7419 from mburke5678/remove-master-service

Changed master service to master-api and master-controllers

Author: mburke5678

admin_guide/backup_restore.adoc

@@ -724,16 +724,10 @@ etcdctl -C https://${ETCD_CA_HOST}:2379 --ca-file=/etc/etcd/ca.crt \
 .. If a failed etcd host was replaced, remove it from the list.
 .. Restart the master API service.
 +
-On a single master cluster installation:
+On each master:
 +
 ----
-# systemctl restart atomic-openshift-master
-----
-+
-On a multi-master cluster installation, on each master:
-+
-----
-# systemctl restart atomic-openshift-master-api
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
 
 The procedure to add an etcd member is complete.
@@ -745,20 +739,6 @@ The procedure to add an etcd member is complete.
 On each {product-title} master, restore your master and node configuration from
 backup and enable and restart all relevant services.
 
-On the master in a single master cluster:
-
-----
-# cp /etc/sysconfig/atomic-openshift-master.rpmsave /etc/sysconfig/atomic-openshift-master
-# cp /etc/origin/master/master-config.yaml.<timestamp> /etc/origin/master/master-config.yaml
-# cp /etc/origin/node/node-config.yaml.<timestamp> /etc/origin/node/node-config.yaml
-# systemctl enable atomic-openshift-master
-# systemctl enable atomic-openshift-node
-# systemctl start atomic-openshift-master
-# systemctl start atomic-openshift-node
-----
-
-On each master in a multi-master cluster:
-
 ----
 # cp /etc/sysconfig/atomic-openshift-master-api.rpmsave /etc/sysconfig/atomic-openshift-master-api
 # cp /etc/sysconfig/atomic-openshift-master-controllers.rpmsave /etc/sysconfig/atomic-openshift-master-controllers

admin_guide/encrypting_data.adoc

@@ -190,17 +190,10 @@ from Golang or `random.random()` from Python are not suitable.
 +
 ifdef::openshift-origin[]
 ----
-# systemctl restart origin-master
+# systemctl restart origin-openshift-master-api origin-openshift-master-controllers
 ----
 endif::[]
 ifdef::openshift-enterprise[]
-On a single master cluster installation:
-+
-----
-# systemctl restart atomic-openshift-master
-----
-On a multi-master cluster installation, on each master:
-+
 ----
 # systemctl restart atomic-openshift-master-api
 ----
@@ -290,17 +283,10 @@ If using a single API server, you can skip this step.
 +
 ifdef::openshift-origin[]
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 ifdef::openshift-enterprise[]
-On a single master cluster installation:
-+
-----
-# systemctl restart atomic-openshift-master
-----
-On a multi-master cluster installation, on each master:
-+
 ----
 # systemctl restart atomic-openshift-master-api
 ----
@@ -314,17 +300,10 @@ key.
 +
 ifdef::openshift-origin[]
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 ifdef::openshift-enterprise[]
-On a single master cluster installation:
-+
-----
-# systemctl restart atomic-openshift-master
-----
-On a multi-master cluster installation, on each master:
-+
 ----
 # systemctl restart atomic-openshift-master-api
 ----
@@ -365,17 +344,10 @@ resources:
 +
 ifdef::openshift-origin[]
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 ifdef::openshift-enterprise[]
-On a single master cluster installation:
-+
-----
-# systemctl restart atomic-openshift-master
-----
-On a multi-master cluster installation, on each master:
-+
 ----
 # systemctl restart atomic-openshift-master-api
 ----

admin_guide/managing_networking.adoc

@@ -136,11 +136,12 @@ admissionConfig:
       location: ""
 ----
 
-. Restart the master service for the changes to take effect:
+. Restart the master services for the changes to take effect:
 +
 [source, bash]
 ----
-$ systemctl restart atomic-openshift-master
+$ systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
+
 ----
 
 [[admin-guide-controlling-egress-traffic]]

admin_guide/managing_projects.adoc

@@ -157,9 +157,16 @@ projectConfig:
 
 Restart the OpenShift service for the changes to take effect:
 
+ifdef::openshift-origin[]
+----
+# systemctl restart origin-master-api origin-master-controllers
+----
+endif::[]
+ifdef::openshift-enterprise[]
 ----
-# systemctl restart atomic-openshift-master
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
+endif::[]
 
 === Setting the Project-wide Node Selector
 
@@ -300,11 +307,11 @@ effect.
 
 ifdef::openshift-origin[]
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 ifdef::openshift-enterprise[]
 ----
-# systemctl restart atomic-openshift-master
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
 endif::[]

admin_guide/quota.adoc

@@ -484,7 +484,18 @@ kubernetesMasterConfig:
 ----
 
 
-After making any changes, restart the master service to apply them.
+After making any changes, restart the master services to apply them.
+
+ifdef::openshift-origin[]
+----
+# systemctl restart origin-master-api origin-master-controllers
+----
+endif::[]
+ifdef::openshift-enterprise[]
+----
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
+----
+endif::[]
 
 Adjusting the regeneration time can be helpful for creating resources and
 determining resource usage when automation is used.

admin_guide/scheduling/scheduler.adoc

@@ -585,13 +585,14 @@ kubernetesMasterConfig:
 ifdef::openshift-origin[]
 +
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 ifdef::openshift-enterprise[]
 +
 ----
-# systemctl restart atomic-openshift-master
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
+
 ----
 endif::[]
 
@@ -674,13 +675,13 @@ kubernetesMasterConfig:
 ifdef::openshift-origin[]
 +
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 ifdef::openshift-enterprise[]
 +
 ----
-# systemctl restart atomic-openshift-master
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
 endif::[]
 
@@ -755,13 +756,13 @@ admissionConfig:
 ifdef::openshift-origin[]
 +
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 ifdef::openshift-enterprise[]
 +
 ----
-# systemctl restart atomic-openshift-master
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
 endif::[]
 

admin_guide/scheduling/taints_tolerations.adoc

@@ -215,12 +215,12 @@ admissionConfig:
 +
 ifdef::openshift-enterprise[]
 ----
-# systemctl restart atomic-openshift-master
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
 endif::[]
 ifdef::openshift-origin[]
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 
@@ -287,12 +287,12 @@ Taints: node.alpha.kubernetes.io/notReady:NoExecute
 +
 ifdef::openshift-enterprise[]
 ----
-# systemctl restart atomic-openshift-master
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
 endif::[]
 ifdef::openshift-origin[]
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 

admin_guide/tcp_ingress_external_ports.adoc

@@ -182,7 +182,18 @@ ifdef::openshift-origin,openshift-enterprise[]
 The externalIPs must be selected by the administrator from the
 *externalIPNetworkCIDRs* range configured in the
 xref:../admin_guide/tcp_ingress_external_ports.adoc#unique-external-ips-ingress-traffic-configure-cluster[*_master-config.yaml_*]
-file. When *_master-config.yaml_* changes, the master service must be restarted.
+file. When *_master-config.yaml_* changes, the master services must be restarted.
+endif::[]
+
+ifdef::openshift-origin[]
+----
+# systemctl restart origin-master-api origin-master-controllers
+----
+endif::[]
+ifdef::openshift-enterprise[]
+----
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
+----
 endif::[]
 
 ifdef::openshift-dedicated,openshift-online[]

admin_solutions/master_node_config.adoc

@@ -273,7 +273,7 @@ oauthConfig:
 . Restart the master for the changes to take effect:
 +
 ----
-$ systemctl restart atomic-openshift-master
+$ systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
 
 You have now manually modified the master and node configuration files,

admin_solutions/user_role_mgmt.adoc

@@ -197,7 +197,7 @@ admissionConfig:
 +
 [source, bash]
 ----
-$ systemctl restart atomic-openshift-master
+$ systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
 
 [NOTE]
@@ -528,13 +528,13 @@ Restart the {product-title} master for the change to take effect:
 ifdef::openshift-origin[]
 [source, bash]
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 ifdef::openshift-enterprise[]
 [source, bash]
 ----
-# systemctl restart atomic-openshift-master
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
 endif::[]
 

architecture/core_concepts/pods_and_services.adoc

@@ -371,7 +371,7 @@ ensuring that traffic arrives at a node with this IP.
 The externalIPs must be selected by the cluster adminitrators from the
 *ExternalIPNetworkCIDRs* range configured in
 xref:../../admin_guide/tcp_ingress_external_ports.adoc#unique-external-ips-ingress-traffic-configure-cluster[*_master-config.yaml_*]
-file. When *_master-config.yaml_* is changed, the master service must be
+file. When *_master-config.yaml_* is changed, the master services must be
 restarted.
 
 .Sample ExternalIPNetworkCIDR /etc/origin/master/master-config.yaml
@@ -456,7 +456,7 @@ Setting the service `type=NodePort` will allocate a port from a flag-configured
 
 The selected port will be reported in the service configuration, under  `spec.ports[*].nodePort`.
 
-To specify a custom port just place the port number in the nodePort field. The custom port number must be in the configured range for nodePorts. When '*master-config.yaml*' is changed the master service must be restarted.
+To specify a custom port just place the port number in the nodePort field. The custom port number must be in the configured range for nodePorts. When '*master-config.yaml*' is changed the master services must be restarted.
 
 .Sample servicesNodePortRange /etc/origin/master/master-config.yaml
 ====

contributing_to_docs/doc_guidelines.adoc

@@ -693,7 +693,7 @@ $$*software package*$$
 
 a|*cluster-admin* user
 
-*atomic-openshift-master* service
+*atomic-openshift-master-api* service
 
 *HTTPD*
 

dev_guide/expose_service/expose_internal_ip_service.adoc

@@ -112,12 +112,12 @@ networkConfig:
 +
 ifdef::openshift-enterprise[]
 ----
-# systemctl restart atomic-openshift-master
+# systemctl restart atomic-openshift-master-api atomic-openshift-master-controllers
 ----
 endif::[]
 ifdef::openshift-origin[]
 ----
-# systemctl restart origin-master
+# systemctl restart origin-master-api origin-master-controllers
 ----
 endif::[]
 
@@ -214,7 +214,7 @@ For example:
 curl 172.30.131.89:3306
 ----
 +
-The examples in this section use a MySQL service, which requires a client application. If you get a string of characters with the `Got packets out of order` message, 
+The examples in this section use a MySQL service, which requires a client application. If you get a string of characters with the `Got packets out of order` message,
 you are connected to the service.
 +
 If you have a MySQL client, log in with the standard CLI command:
@@ -280,7 +280,7 @@ For example:
 curl 192.168.120.10:3306
 ----
 +
-If you get a string of characters with the `Got packets out of order` message, 
+If you get a string of characters with the `Got packets out of order` message,
 you are connected to the service.
 +
 If you have a MySQL client, log in with the standard CLI command:
@@ -422,7 +422,7 @@ For example:
 curl 192.168.120.10:3306
 ----
 +
-If you get a string of characters with the `Got packets out of order` message, 
+If you get a string of characters with the `Got packets out of order` message,
 your service is accessible from the node.
 
 *On the system that is not in the cluster:*

dev_guide/managing_images.adoc

@@ -1002,7 +1002,7 @@ running the registry import controller (typically the master node).
 
 The certificate or CA certificate must be added to `/etc/pki/tls/certs` or `/etc/pki/ca-trust`,
 respectively, on the host system. The `update-ca-trust` command will also need to be
-run on Red Hat distributions followed by a restart of the master service to pick up
+run on Red Hat distributions followed by a restart of the master services to pick up
 the certificate changes.