Add timezone and localtime to list of mounted volumes in agent container

Use the common vars that were built for openstack and add the CNI related
volumes to be used for kubernetes and openshift.

Change-Id: I0412c42989b33a53351e0d1a879be1d1bcefbe69
closes-bug: #1711287

playbooks/roles/node/defaults/main.yml

@@ -114,6 +114,10 @@ contrail_agent_kernel_volumes:
   - "/lib/modules:/lib/modules"
   - "/usr/src:/usr/src"
   - "/var/lib/contrail:/var/lib/contrail"
+contrail_agent_cni_volumes:
+  - "/opt/cni/bin:/host/opt_cni_bin"
+  - "/etc/cni:/host/etc_cni"
+  - "/var/log/contrail/cni:/host/log_cni"
 
 contrail_vcplugin_log_volumes:
   - "/var/log/contrail/vcplugin:/var/log/contrail"
@@ -122,6 +126,7 @@ contrail_controller_volumes: "{{ contrail_container_volumes + contrail_controlle
 contrail_analytics_volumes: "{{ contrail_container_volumes + contrail_analytics_log_volumes }}"
 contrail_analyticsdb_volumes: "{{ contrail_container_volumes + contrail_analyticsdb_log_volumes + contrail_analyticsdb_data_volumes }}"
 contrail_agent_volumes: "{{ contrail_container_volumes + contrail_agent_log_volumes + contrail_agent_kernel_volumes }}"
+contrail_agent_kubernetes_volumes: "{{ contrail_container_volumes + contrail_agent_log_volumes + contrail_agent_kernel_volumes + contrail_agent_cni_volumes }}"
 
 contrail_vcplugin_volumes: "{{ contrail_container_volumes + contrail_vcplugin_log_volumes }}"
 kube_manager_log_volumes:

playbooks/roles/node/tasks/agent.yml

@@ -135,14 +135,7 @@
     pull: "{{ always_pull_image }}"
     capabilities:
       - AUDIT_WRITE
-    volumes:
-      - "/lib/modules:/lib/modules"
-      - "/usr/src:/usr/src"
-      - "{{ contrailctl_config_directory }}:/etc/contrailctl/"
-      - "/var/lib/contrail:/var/lib/contrail"
-      - "/opt/cni/bin:/host/opt_cni_bin"
-      - "/etc/cni:/host/etc_cni"
-      - "/var/log/contrail/cni:/host/log_cni"
+    volumes: "{{ contrail_agent_kubernetes_volumes }}"
   when: cloud_orchestrator in ['kubernetes', 'openshift']
 
 - name: sm_status_report - agent_completed