Standardize master restart

- Updates all instances of 'restart master' and 'verify API server'
- Removes unused master_api_service_status_changed var
- Removes unused handlers from openshift_metrics and openshift_logging
- Adds retries back to service restarts
- Increases retries from 3 to 5 (from previous setting)
- Moves need for handler defined in play for scaleup to role task file

playbooks/openshift-master/private/scaleup.yml

@@ -2,37 +2,11 @@
 - name: Update master count
   hosts: oo_masters:!oo_masters_to_config
   serial: 1
-  roles:
-  - openshift_facts
-  post_tasks:
+  tasks:
   - name: Update master count
-    modify_yaml:
-      dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
-      yaml_key: 'kubernetesMasterConfig.masterCount'
-      yaml_value: "{{ openshift_master_count | default(groups.oo_masters | length) }}"
-    notify:
-    - restart master
-  handlers:
-  - name: restart master
-    command: /usr/local/bin/master-restart "{{ item }}"
-    with_items:
-    - api
-    - controllers
-    notify: verify api server
-  - name: verify api server
-    command: >
-      curl --silent --tlsv1.2 --max-time 2
-      --cacert {{ openshift.common.config_base }}/master/ca-bundle.crt
-      {{ openshift.master.api_url }}/healthz/ready
-    args:
-      # Disables the following warning:
-      # Consider using get_url or uri module rather than running curl
-      warn: no
-    register: api_available_output
-    until: api_available_output.stdout == 'ok'
-    retries: 120
-    delay: 1
-    changed_when: false
+    import_role:
+      name: openshift_control_plane
+      tasks_from: update_master_count.yml
 
 - import_playbook: ../../openshift-node/private/bootstrap.yml
 

roles/openshift_cloud_provider/handlers/main.yml

@@ -4,10 +4,11 @@
   with_items:
   - api
   - controllers
-  when:
-  - not (master_api_service_status_changed | default(false) | bool)
-  notify:
-  - verify API server
+  retries: 5
+  delay: 5
+  register: result
+  until: result.rc == 0
+  notify: verify API server
 
 - name: verify API server
   # Using curl here since the uri module requires python-httplib2 and

roles/openshift_control_plane/handlers/main.yml

@@ -4,10 +4,11 @@
   with_items:
   - api
   - controllers
-  when:
-  - not (master_api_service_status_changed | default(false) | bool)
-  notify:
-  - verify API server
+  retries: 5
+  delay: 5
+  register: result
+  until: result.rc == 0
+  notify: verify API server
 
 - name: verify API server
   # Using curl here since the uri module requires python-httplib2 and

roles/openshift_control_plane/tasks/registry_auth.yml

@@ -15,8 +15,7 @@
   retries: 3
   delay: 5
   until: master_oreg_auth_credentials_create.rc == 0
-  notify:
-  - restart master
+  notify: restart master
 
 # docker_creds is a custom module from lib_utils
 # 'docker login' requires a docker.service running on the local host, this is an
@@ -33,5 +32,4 @@
   - oreg_auth_user is defined
   - (not master_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool
   register: master_oreg_auth_credentials_create_alt
-  notify:
-  - restart master
+  notify: restart master

roles/openshift_control_plane/tasks/restart.yml

@@ -4,22 +4,8 @@
   with_items:
   - api
   - controllers
-  notify:
-  - verify API server
-
-- name: verify API server
-  # Using curl here since the uri module requires python-httplib2 and
-  # wait_for port doesn't provide health information.
-  command: >
-    curl --silent --tlsv1.2
-    --cacert {{ openshift.common.config_base }}/master/ca-bundle.crt
-    {{ openshift.master.api_url }}/healthz/ready
-  args:
-    # Disables the following warning:
-    # Consider using get_url or uri module rather than running curl
-    warn: no
-  register: l_api_available_output
-  until: l_api_available_output.stdout == 'ok'
-  retries: 120
-  delay: 1
-  changed_when: false
+  retries: 5
+  delay: 5
+  register: result
+  until: result.rc == 0
+  notify: verify API server

roles/openshift_control_plane/tasks/update_etcd_client_urls.yml

@@ -1,7 +1,7 @@
 ---
-- yedit:
+- name: Update etcd client URLs
+  yedit:
     src: "{{ openshift.common.config_base }}/master/master-config.yaml"
     key: 'etcdClientInfo.urls'
     value: "{{ openshift_master_etcd_urls }}"
-  notify:
-  - restart master
+  notify: restart master

roles/openshift_control_plane/tasks/update_master_count.yml

@@ -0,0 +1,7 @@
+---
+- name: Update master count
+  yedit:
+    src: "{{ openshift.common.config_base }}/master/master-config.yaml"
+    key: 'kubernetesMasterConfig.masterCount'
+    value: "{{ openshift_master_count | default(groups.oo_masters | length) }}"
+  notify: restart master

roles/openshift_logging/handlers/main.yml

@@ -1,25 +0,0 @@
----
-- name: restart master
-  command: /usr/local/bin/master-restart "{{ item }}"
-  with_items:
-  - api
-  - controllers
-  when: (not (master_api_service_status_changed | default(false) | bool))
-  notify: Verify API Server
-
-- name: Verify API Server
-  # Using curl here since the uri module requires python-httplib2 and
-  # wait_for port doesn't provide health information.
-  command: >
-    curl --silent --tlsv1.2 --max-time 2
-    --cacert {{ openshift.common.config_base }}/master/ca-bundle.crt
-    {{ openshift.master.api_url }}/healthz/ready
-  args:
-    # Disables the following warning:
-    # Consider using get_url or uri module rather than running curl
-    warn: no
-  register: api_available_output
-  until: api_available_output.stdout == 'ok'
-  retries: 120
-  delay: 1
-  changed_when: false

roles/openshift_metrics/handlers/main.yml

@@ -1,25 +0,0 @@
----
-- name: restart master
-  command: /usr/local/bin/master-restart "{{ item }}"
-  with_items:
-  - api
-  - controllers
-  when: (not (master_api_service_status_changed | default(false) | bool))
-  notify: Verify API Server
-
-- name: Verify API Server
-  # Using curl here since the uri module requires python-httplib2 and
-  # wait_for port doesn't provide health information.
-  command: >
-    curl --silent --tlsv1.2 --max-time 2
-    --cacert {{ openshift.common.config_base }}/master/ca-bundle.crt
-    {{ openshift.master.api_url }}/healthz/ready
-  args:
-    # Disables the following warning:
-    # Consider using get_url or uri module rather than running curl
-    warn: no
-  register: api_available_output
-  until: api_available_output.stdout == 'ok'
-  retries: 120
-  delay: 1
-  changed_when: false