Update ansible code to preseve path on non-atomic hosts

roles/lib_utils/action_plugins/master_check_paths_in_config.py

@@ -33,6 +33,7 @@ ALLOWED_DIRS = (
     '/var/lib/origin',
     '/etc/origin/cloudprovider',
     '/etc/origin/kubelet-plugins',
+    '/usr/libexec/kubernetes/kubelet-plugins',
 )
 
 ALLOWED_DIRS_STRING = ', '.join(ALLOWED_DIRS)

roles/openshift_control_plane/files/controller.yaml

@@ -33,7 +33,7 @@ spec:
        name: master-cloud-provider
      - mountPath: /etc/containers/registries.d/
        name: signature-import
-     - mountPath: /etc/origin/kubelet-plugins
+     - mountPath: /usr/libexec/kubernetes/kubelet-plugins
        name: kubelet-plugins
     livenessProbe:
       httpGet:
@@ -54,4 +54,4 @@ spec:
     name: signature-import
   - name: kubelet-plugins
     hostPath:
-      path: /etc/origin/kubelet-plugins
+      path: /usr/libexec/kubernetes/kubelet-plugins

roles/openshift_control_plane/tasks/main.yml

@@ -45,11 +45,19 @@
     path: "/etc/origin/master"
     state: directory
 
-- name: Create flexvolume directory when containerized
+- name: Create flexvolume directory when on atomic hosts
   file:
     state: directory
     path: "{{ openshift_flexvolume_container_directory_default }}/volume/exec"
     mode: '0750'
+  when: openshift_is_atomic | bool
+
+- name: Flex volume directory on non-atomic host
+  file:
+    state: directory
+    path: "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/"
+    mode: '0750'
+  when: not openshift_is_atomic | bool
 
 - name: Create the policy file if it does not already exist
   command: >

roles/openshift_control_plane/tasks/static.yml

@@ -45,6 +45,16 @@
     - key: spec.containers[0].readinessProbe.httpGet.port
       value: "{{ openshift_master_api_port }}"
 
+- name: Update controller-manager static pod on atomic host
+  yedit:
+    src: "{{ mktemp.stdout }}/controller.yaml"
+    edits:
+    - key: spec.volumes[3].hostPath.path
+      value: "{{ openshift_flexvolume_container_directory_default }}"
+    - key: spec.containers[0].volumeMounts[3].mountPath
+      value: "{{ openshift_flexvolume_container_directory_default }}"
+  when: openshift_is_atomic | bool
+
 - name: ensure pod location exists
   file:
     path: "{{ openshift_control_plane_static_pod_location }}"

roles/openshift_control_plane/templates/master.yaml.v1.j2

@@ -83,8 +83,10 @@ kubernetesMasterConfig:
     - VolumeScheduling=true
 {% endif %}
   controllerArguments: {{ openshift.master.controller_args | default(None) | lib_utils_to_padded_yaml( level=2 ) }}
+{% if openshift_is_atomic | bool %}
     flex-volume-plugin-dir:
     - "{{ openshift_flexvolume_container_directory_default }}/volume/exec"
+{% end %}
 {% if openshift_master_use_persistentlocalvolumes | bool %}
     feature-gates:
     - PersistentLocalVolumes=true