Add extra volumes support for services that were not previously suppo…

…rted We don't add extra volumes support for all services in patch [1]. In order to unify the management of the volume, so we need add extra volumes support for these services. [1] https://opendev.org/openstack/kolla-ansible/commit/12ff28a69351cf8ab4ef3390739e04862ba76983 Change-Id: Ie148accdd8e6c60df6b521d55bda12b850c0d255 Partially-Implements: blueprint support-extra-volumes Signed-off-by: ZijianGuo <guozijn@gmail.com>
openstack · Jun 27, 2019 · e610a73 · e610a73
1 parent 100a207
commit e610a73
Show file tree

Hide file tree

Showing 32 changed files with 500 additions and 322 deletions.
diff --git a/ansible/roles/chrony/defaults/main.yml b/ansible/roles/chrony/defaults/main.yml
@@ -8,10 +8,7 @@ chrony_services:
     image: "{{ chrony_image_full }}"
     enabled: True
     privileged: True
-    volumes:
-      - "{{ node_config_directory }}/chrony/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla"
+    volumes: "{{ chrony_default_volumes + chrony_extra_volumes }}"
     dimensions: "{{ chrony_dimensions }}"
 
 chrony_bindaddress: "{{ kolla_internal_vip_address }}"
@@ -24,3 +21,9 @@ chrony_tag: "{{ openstack_release }}"
 chrony_image_full: "{{ chrony_image }}:{{ chrony_tag }}"
 
 chrony_dimensions: "{{ default_container_dimensions }}"
+
+chrony_default_volumes:
+  - "{{ node_config_directory }}/chrony/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "kolla_logs:/var/log/kolla"
+chrony_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/collectd/defaults/main.yml b/ansible/roles/collectd/defaults/main.yml
@@ -8,13 +8,7 @@ collectd_services:
     enabled: true
     image: "{{ collectd_image_full }}"
     privileged: True
-    volumes:
-      - "{{ node_config_directory }}/collectd/:{{ container_config_directory }}/:ro"
-      - "{{node_config_directory }}/collectd/collectd.conf.d/:/etc/collectd/collectd.conf.d/"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
-      - "/sys/:/sys/:ro"
-      - "/dev/:/dev/:ro"
+    volumes: "{{ collectd_default_volumes + collectd_extra_volumes }}"
     dimensions: "{{ collectd_dimensions }}"
 
 ####################
@@ -26,6 +20,15 @@ collectd_image_full: "{{ collectd_image }}:{{ collectd_tag }}"
 
 collectd_dimensions: "{{ default_container_dimensions }}"
 
+collectd_default_volumes:
+  - "{{ node_config_directory }}/collectd/:{{ container_config_directory }}/:ro"
+  - "{{node_config_directory }}/collectd/collectd.conf.d/:/etc/collectd/collectd.conf.d/"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "kolla_logs:/var/log/kolla/"
+  - "/sys/:/sys/:ro"
+  - "/dev/:/dev/:ro"
+collectd_extra_volumes: "{{ default_extra_volumes }}"
+
 ####################
 # OpenStack
 ####################

diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
@@ -12,10 +12,7 @@ common_services:
     image: "{{ fluentd_image_full }}"
     environment:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    volumes:
-      - "{{ node_config_directory }}/fluentd/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ fluentd_default_volumes + fluentd_extra_volumes }}"
     dimensions: "{{ fluentd_dimensions }}"
   kolla-toolbox:
     container_name: kolla_toolbox
@@ -25,12 +22,7 @@ common_services:
       ANSIBLE_NOCOLOR: "1"
       ANSIBLE_LIBRARY: "/usr/share/ansible"
     privileged: True
-    volumes:
-      - "{{ node_config_directory }}/kolla-toolbox/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/dev/:/dev/"
-      - "/run/:/run/:shared"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ kolla_toolbox_default_volumes + kolla_toolbox_extra_volumes }}"
     dimensions: "{{ kolla_toolbox_dimensions }}"
   # DUMMY_ENVIRONMENT is needed because empty environment is not supported
   cron:
@@ -39,10 +31,7 @@ common_services:
     image: "{{ cron_image_full }}"
     environment:
       DUMMY_ENVIRONMENT: kolla_useless_env
-    volumes:
-      - "{{ node_config_directory }}/cron/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ cron_default_volumes + cron_extra_volumes }}"
     dimensions: "{{ cron_dimensions }}"
 
 #######################
@@ -80,3 +69,21 @@ fluentd_image_full: "{{ fluentd_image }}:{{ fluentd_tag }}"
 
 syslog_swift_facility: "local0"
 syslog_haproxy_facility: "local1"
+
+kolla_toolbox_default_volumes:
+  - "{{ node_config_directory }}/kolla-toolbox/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "/dev/:/dev/"
+  - "/run/:/run/:shared"
+  - "kolla_logs:/var/log/kolla/"
+cron_default_volumes:
+  - "{{ node_config_directory }}/cron/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "kolla_logs:/var/log/kolla/"
+fluentd_default_volumes:
+  - "{{ node_config_directory }}/fluentd/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "kolla_logs:/var/log/kolla/"
+kolla_toolbox_extra_volumes: "{{ default_extra_volumes }}"
+cron_extra_volumes: "{{ default_extra_volumes }}"
+fluentd_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/elasticsearch/defaults/main.yml b/ansible/roles/elasticsearch/defaults/main.yml
@@ -9,10 +9,7 @@ elasticsearch_services:
     image: "{{ elasticsearch_image_full }}"
     environment:
       ES_JAVA_OPTS: "{{ es_java_opts }}"
-    volumes:
-      - "{{ node_config_directory }}/elasticsearch/:{{ container_config_directory }}/"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "{{ elasticsearch_datadir_volume }}:/var/lib/elasticsearch/data"
+    volumes: "{{ elasticsearch_default_volumes + elasticsearch_extra_volumes }}"
     dimensions: "{{ elasticsearch_dimensions }}"
     haproxy:
       elasticsearch:
@@ -39,3 +36,9 @@ elasticsearch_tag: "{{ openstack_release }}"
 elasticsearch_image_full: "{{ elasticsearch_image }}:{{ elasticsearch_tag }}"
 
 elasticsearch_dimensions: "{{ default_container_dimensions }}"
+
+elasticsearch_default_volumes:
+  - "{{ node_config_directory }}/elasticsearch/:{{ container_config_directory }}/"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "{{ elasticsearch_datadir_volume }}:/var/lib/elasticsearch/data"
+elasticsearch_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/etcd/defaults/main.yml b/ansible/roles/etcd/defaults/main.yml
@@ -19,11 +19,7 @@ etcd_services:
       ETCD_OUT_FILE: "/var/log/kolla/etcd/etcd.log"
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
     image: "{{ etcd_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/etcd/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_etcd:/var/lib/etcd/"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ etcd_default_volumes + etcd_extra_volumes }}"
     dimensions: "{{ etcd_dimensions }}"
 
 
@@ -34,3 +30,10 @@ etcd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_nam
 etcd_tag: "{{ openstack_release }}"
 etcd_image_full: "{{ etcd_image }}:{{ etcd_tag }}"
 etcd_dimensions: "{{ default_container_dimensions }}"
+
+etcd_default_volumes:
+  - "{{ node_config_directory }}/etcd/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "kolla_etcd:/var/lib/etcd/"
+  - "kolla_logs:/var/log/kolla/"
+etcd_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/grafana/defaults/main.yml b/ansible/roles/grafana/defaults/main.yml
@@ -7,11 +7,7 @@ grafana_services:
     group: grafana
     enabled: true
     image: "{{ grafana_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/grafana/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "grafana:/var/lib/grafana/"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ grafana_default_volumes + grafana_extra_volumes }}"
     dimensions: "{{ grafana_dimensions }}"
     haproxy:
       grafana_server:
@@ -67,3 +63,10 @@ grafana_image_full: "{{ grafana_image }}:{{ grafana_tag }}"
 grafana_admin_username: "admin"
 
 grafana_dimensions: "{{ default_container_dimensions }}"
+
+grafana_default_volumes:
+  - "{{ node_config_directory }}/grafana/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "grafana:/var/lib/grafana/"
+  - "kolla_logs:/var/log/kolla/"
+grafana_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/influxdb/defaults/main.yml b/ansible/roles/influxdb/defaults/main.yml
@@ -7,11 +7,7 @@ influxdb_services:
     group: influxdb
     enabled: true
     image: "{{ influxdb_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/influxdb/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "influxdb:/var/lib/influxdb"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ influxdb_default_volumes + influxdb_extra_volumes }}"
     dimensions: "{{ influxdb_dimensions }}"
     haproxy:
       influxdb_admin:
@@ -33,3 +29,10 @@ influxdb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker
 influxdb_tag: "{{ openstack_release }}"
 influxdb_image_full: "{{ influxdb_image }}:{{ influxdb_tag }}"
 influxdb_dimensions: "{{ default_container_dimensions }}"
+
+influxdb_default_volumes:
+  - "{{ node_config_directory }}/influxdb/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "influxdb:/var/lib/influxdb"
+  - "kolla_logs:/var/log/kolla/"
+influxdb_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/iscsi/defaults/main.yml b/ansible/roles/iscsi/defaults/main.yml
@@ -9,17 +9,7 @@ iscsi_services:
     image: "{{ iscsid_image_full }}"
     ipc_mode: "host"
     privileged: True
-    volumes:
-      - "{{ node_config_directory }}/iscsid/:{{ container_config_directory }}/:ro"
-      - "kolla_logs:/var/log/kolla/"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/dev/:/dev/"
-      - "/run/:/run/:shared"
-      - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
-      - "/lib/modules:/lib/modules:ro"
-      - "/sys/kernel/config:/configfs"
-      - "cinder:/var/lib/cinder"
-      - "iscsi_info:/etc/iscsi"
+    volumes: "{{ iscsid_default_volumes + iscsid_extra_volumes }}"
     dimensions: "{{ iscsid_dimensions }}"
   tgtd:
     container_name: tgtd
@@ -28,17 +18,7 @@ iscsi_services:
     image: "{{ tgtd_image_full }}"
     ipc_mode: "host"
     privileged: True
-    volumes:
-      - "{{ node_config_directory }}/tgtd/:{{ container_config_directory }}/:ro"
-      - "kolla_logs:/var/log/kolla/"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/dev/:/dev/"
-      - "/run/:/run/:shared"
-      - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
-      - "/lib/modules:/lib/modules:ro"
-      - "/sys/kernel/config:/configfs"
-      - "cinder:/var/lib/cinder"
-      - "iscsi_info:/etc/iscsi"
+    volumes: "{{ tgtd_default_volumes + tgtd_extra_volumes }}"
     dimensions: "{{ tgtd_dimensions }}"
 
 
@@ -59,6 +39,31 @@ tgtd_image_full: "{{ tgtd_image }}:{{ tgtd_tag }}"
 iscsid_dimensions: "{{ default_container_dimensions }}"
 tgtd_dimensions: "{{ default_container_dimensions }}"
 
+iscsid_default_volumes:
+  - "{{ node_config_directory }}/iscsid/:{{ container_config_directory }}/:ro"
+  - "kolla_logs:/var/log/kolla/"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "/dev/:/dev/"
+  - "/run/:/run/:shared"
+  - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - "/lib/modules:/lib/modules:ro"
+  - "/sys/kernel/config:/configfs"
+  - "cinder:/var/lib/cinder"
+  - "iscsi_info:/etc/iscsi"
+tgtd_default_volumes:
+  - "{{ node_config_directory }}/tgtd/:{{ container_config_directory }}/:ro"
+  - "kolla_logs:/var/log/kolla/"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "/dev/:/dev/"
+  - "/run/:/run/:shared"
+  - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - "/lib/modules:/lib/modules:ro"
+  - "/sys/kernel/config:/configfs"
+  - "cinder:/var/lib/cinder"
+  - "iscsi_info:/etc/iscsi"
+iscsid_extra_volumes: "{{ default_extra_volumes }}"
+tgtd_extra_volumes: "{{ default_extra_volumes }}"
+
 enable_iscsid_for_cinder: >-
   {{ (inventory_hostname in groups['compute']
       or inventory_hostname in groups['cinder-volume'])

diff --git a/ansible/roles/kafka/defaults/main.yml b/ansible/roles/kafka/defaults/main.yml
@@ -10,11 +10,7 @@ kafka_services:
     environment:
       LOG_DIR: "{{ kafka_log_dir }}"
       KAFKA_HEAP_OPTS: "{{ kafka_heap_opts }}"
-    volumes:
-      - "{{ node_config_directory }}/kafka/:{{ container_config_directory }}/"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kafka:/var/lib/kafka/data"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ kafka_default_volumes + kafka_extra_volumes }}"
     dimensions: "{{ kafka_dimensions }}"
 
 ####################
@@ -34,3 +30,10 @@ kafka_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_na
 kafka_tag: "{{ openstack_release }}"
 kafka_image_full: "{{ kafka_image }}:{{ kafka_tag }}"
 kafka_dimensions: "{{ default_container_dimensions }}"
+
+kafka_default_volumes:
+  - "{{ node_config_directory }}/kafka/:{{ container_config_directory }}/"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "kafka:/var/lib/kafka/data"
+  - "kolla_logs:/var/log/kolla/"
+kafka_extra_volumes: "{{ default_extra_volumes }}"
diff --git a/ansible/roles/karbor/defaults/main.yml b/ansible/roles/karbor/defaults/main.yml
@@ -7,10 +7,7 @@ karbor_services:
     group: karbor-api
     enabled: true
     image: "{{ karbor_api_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/karbor-api/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ karbor_api_default_volumes + karbor_api_extra_volumes }}"
     dimensions: "{{ karbor_api_dimensions }}"
     haproxy:
       karbor_api:
@@ -28,20 +25,14 @@ karbor_services:
     group: karbor-protection
     enabled: true
     image: "{{ karbor_protection_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/karbor-protection/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ karbor_protection_default_volumes + karbor_protection_extra_volumes }}"
     dimensions: "{{ karbor_protection_dimensions }}"
   karbor-operationengine:
     container_name: karbor_operationengine
     group: karbor-operationengine
     enabled: true
     image: "{{ karbor_operationengine_image_full }}"
-    volumes:
-      - "{{ node_config_directory }}/karbor-operationengine/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ karbor_operationengine_default_volumes + karbor_operationengine_extra_volumes }}"
     dimensions: "{{ karbor_operationengine_dimensions }}"
 
 
@@ -63,6 +54,7 @@ karbor_protection_image: "{{ docker_registry ~ '/' if docker_registry else '' }}
 karbor_protection_tag: "{{ karbor_tag }}"
 karbor_protection_image_full: "{{ karbor_protection_image }}:{{ karbor_protection_tag }}"
 
+
 karbor_operationengine_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ karbor_install_type }}-karbor-operationengine"
 karbor_operationengine_tag: "{{ karbor_tag }}"
 karbor_operationengine_image_full: "{{ karbor_operationengine_image }}:{{ karbor_operationengine_tag }}"
@@ -75,6 +67,22 @@ karbor_api_dimensions: "{{ default_container_dimensions }}"
 karbor_protection_dimensions: "{{ default_container_dimensions }}"
 karbor_operationengine_dimensions: "{{ default_container_dimensions }}"
 
+karbor_protection_default_volumes:
+  - "{{ node_config_directory }}/karbor-protection/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "kolla_logs:/var/log/kolla/"
+karbor_operationengine_default_volumes:
+  - "{{ node_config_directory }}/karbor-operationengine/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "kolla_logs:/var/log/kolla/"
+karbor_api_default_volumes:
+  - "{{ node_config_directory }}/karbor-api/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "kolla_logs:/var/log/kolla/"
+karbor_extra_volumes: "{{ default_extra_volumes }}"
+karbor_protection_extra_volumes: "{{ karbor_extra_volumes }}"
+karbor_operationengine_extra_volumes: "{{ karbor_extra_volumes }}"
+karbor_api_extra_volumes: "{{ karbor_extra_volumes }}"
 
 ####################
 # OpenStack

diff --git a/ansible/roles/kibana/defaults/main.yml b/ansible/roles/kibana/defaults/main.yml
@@ -7,10 +7,7 @@ kibana_services:
     image: "{{ kibana_image_full }}"
     enabled: true
     group: "kibana"
-    volumes:
-      - "{{ node_config_directory }}/kibana/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
+    volumes: "{{ kibana_default_volumes + kibana_extra_volumes }}"
     dimensions: "{{ kibana_dimensions }}"
     haproxy:
       kibana:
@@ -55,3 +52,9 @@ kibana_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_n
 kibana_tag: "{{ openstack_release }}"
 kibana_image_full: "{{ kibana_image }}:{{ kibana_tag }}"
 kibana_dimensions: "{{ default_container_dimensions }}"
+
+kibana_default_volumes:
+  - "{{ node_config_directory }}/kibana/:{{ container_config_directory }}/:ro"
+  - "/etc/localtime:/etc/localtime:ro"
+  - "kolla_logs:/var/log/kolla/"
+kibana_extra_volumes: "{{ default_extra_volumes }}"