Merge pull request #9895 from yasensim/master

NSX-T fixes #8134 and fixes NSX #8015, PR #8016

roles/lib_utils/action_plugins/sanity_checks.py

@@ -20,7 +20,8 @@ NET_PLUGIN_LIST = (('openshift_use_openshift_sdn', True),
                    ('openshift_use_nuage', False),
                    ('openshift_use_contiv', False),
                    ('openshift_use_calico', False),
-                   ('openshift_use_kuryr', False))
+                   ('openshift_use_kuryr', False),
+                   ('openshift_use_nsx', False))
 
 ENTERPRISE_TAG_REGEX_ERROR = """openshift_image_tag must be in the format
 v#.#[.#[.#]]. Examples: v1.2, v3.4.1, v3.5.1.3,

roles/openshift_node/tasks/upgrade/stop_services.yml

@@ -1,10 +1,9 @@
 ---
-- name: Stop node and openvswitch services
+- name: Stop node services
   service:
     name: "{{ item }}"
     state: stopped
   with_items:
-  - openvswitch
   - "{{ openshift_service_type }}-node"
   failed_when: false