openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add extra volumes support for services that were not previously supported"

Browse Source
This commit is contained in:
Zuul 2019-08-05 09:02:04 +00:00 committed by Gerrit Code Review
commit 8f70bc22d6
32 changed files with 500 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ansible/roles/chrony/defaults/main.yml
View File

@ -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 }}"

17
ansible/roles/collectd/defaults/main.yml
View File

@ -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
####################

35
ansible/roles/common/defaults/main.yml
View File

@ -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 }}"

11
ansible/roles/elasticsearch/defaults/main.yml
View File

@ -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 }}"

13
ansible/roles/etcd/defaults/main.yml
View File

@ -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 }}"

13
ansible/roles/grafana/defaults/main.yml
View File

@ -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 }}"

13
ansible/roles/influxdb/defaults/main.yml
View File

@ -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:
@ -41,3 +37,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 }}"

49
ansible/roles/iscsi/defaults/main.yml
View File

@ -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'])

13
ansible/roles/kafka/defaults/main.yml
View File

@ -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 }}"

32
ansible/roles/karbor/defaults/main.yml
View File

@ -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

11
ansible/roles/kibana/defaults/main.yml
View File

@ -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 }}"

13
ansible/roles/mariadb/defaults/main.yml
View File

@ -7,11 +7,7 @@ mariadb_services:
group: mariadb
enabled: true
image: "{{ mariadb_image_full }}"
volumes:
- "{{ node_config_directory }}/mariadb/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "mariadb:/var/lib/mysql"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ mariadb_default_volumes + mariadb_extra_volumes }}"
dimensions: "{{ mariadb_dimensions }}"
haproxy:
mariadb:
@ -58,6 +54,13 @@ mariadb_tag: "{{ openstack_release }}"
mariadb_image_full: "{{ mariadb_image }}:{{ mariadb_tag }}"
mariadb_dimensions: "{{ default_container_dimensions }}"
mariadb_default_volumes:
- "{{ node_config_directory }}/mariadb/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "mariadb:/var/lib/mysql"
- "kolla_logs:/var/log/kolla/"
mariadb_extra_volumes: "{{ default_extra_volumes }}"
########################################
# Vars used within recover_cluster.yml
########################################

9
ansible/roles/memcached/defaults/main.yml
View File

@ -7,9 +7,7 @@ memcached_services:
image: "{{ memcached_image_full }}"
enabled: true
group: "memcached"
volumes:
- "{{ node_config_directory }}/memcached/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
volumes: "{{ memcached_default_volumes + memcached_extra_volumes }}"
dimensions: "{{ memcached_dimensions }}"
haproxy:
memcached:
@ -37,6 +35,11 @@ memcached_tag: "{{ openstack_release }}"
memcached_image_full: "{{ memcached_image }}:{{ memcached_tag }}"
memcached_dimensions: "{{ default_container_dimensions }}"
memcached_default_volumes:
- "{{ node_config_directory }}/memcached/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
memcached_extra_volumes: "{{ default_extra_volumes }}"
####################
# Memcached options
####################

131
ansible/roles/monasca/defaults/main.yml
View File

@ -7,10 +7,7 @@ monasca_services:
group: monasca-api
enabled: true
image: "{{ monasca_api_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
volumes: "{{ monasca_api_default_volumes + monasca_api_extra_volumes }}"
dimensions: "{{ monasca_api_dimensions }}"
haproxy:
monasca_api:
@ -28,10 +25,7 @@ monasca_services:
group: monasca-log-api
enabled: true
image: "{{ monasca_log_api_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-log-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
volumes: "{{ monasca_log_api_default_volumes + monasca_log_api_extra_volumes }}"
dimensions: "{{ monasca_log_api_dimensions }}"
haproxy:
monasca_log_api:
@ -49,61 +43,42 @@ monasca_services:
group: monasca-log-transformer
enabled: true
image: "{{ monasca_logstash_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-log-transformer/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
volumes: "{{ monasca_log_transformer_default_volumes + monasca_log_transformer_extra_volumes }}"
dimensions: "{{ monasca_log_transformer_dimensions }}"
monasca-log-persister:
container_name: monasca_log_persister
group: monasca-log-persister
enabled: true
image: "{{ monasca_logstash_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-log-persister/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
volumes: "{{ monasca_log_persister_default_volumes + monasca_log_persister_extra_volumes }}"
dimensions: "{{ monasca_log_persister_dimensions }}"
monasca-log-metrics:
container_name: monasca_log_metrics
group: monasca-log-metrics
enabled: true
image: "{{ monasca_logstash_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-log-metrics/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
volumes: "{{ monasca_log_metrics_default_volumes + monasca_log_metrics_extra_volumes }}"
dimensions: "{{ monasca_log_metrics_dimensions }}"
monasca-thresh:
container_name: monasca_thresh
group: monasca-thresh
enabled: true
image: "{{ monasca_thresh_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-thresh/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "monasca_thresh:/var/lib/monasca-thresh/"
- "kolla_logs:/var/log/kolla"
volumes: "{{ monasca_thresh_default_volumes + monasca_thresh_extra_volumes }}"
dimensions: "{{ monasca_thresh_dimensions }}"
monasca-notification:
container_name: monasca_notification
group: monasca-notification
enabled: true
image: "{{ monasca_notification_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-notification/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
volumes: "{{ monasca_notification_default_volumes + monasca_notification_extra_volumes }}"
dimensions: "{{ monasca_notification_dimensions }}"
monasca-persister:
container_name: monasca_persister
group: monasca-persister
enabled: true
image: "{{ monasca_persister_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-persister/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
volumes: "{{ monasca_persister_default_volumes + monasca_persister_extra_volumes }}"
dimensions: "{{ monasca_persister_dimensions }}"
monasca-agent-collector:
container_name: monasca_agent_collector
@ -111,43 +86,28 @@ monasca_services:
enabled: true
image: "{{ monasca_agent_image_full }}"
pid_mode: "host"
volumes:
- "{{ node_config_directory }}/monasca-agent-collector/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
- "/sys:/sys:ro"
- "/dev/disk/:/dev/disk:ro"
volumes: "{{ monasca_agent_collector_default_volumes + monasca_agent_collector_extra_volumes }}"
dimensions: "{{ monasca_agent_dimensions }}"
monasca-agent-statsd:
container_name: monasca_agent_statsd
group: monasca-agent-statsd
enabled: true
image: "{{ monasca_agent_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-agent-statsd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
volumes: "{{ monasca_agent_statsd_default_volumes + monasca_agent_statsd_extra_volumes }}"
dimensions: "{{ monasca_agent_dimensions }}"
monasca-agent-forwarder:
container_name: monasca_agent_forwarder
group: monasca-agent-forwarder
enabled: true
image: "{{ monasca_agent_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-agent-forwarder/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
volumes: "{{ monasca_agent_forwarder_default_volumes + monasca_agent_forwarder_extra_volumes }}"
dimensions: "{{ monasca_agent_dimensions }}"
monasca-grafana:
container_name: monasca_grafana
group: monasca-grafana
enabled: true
image: "{{ monasca_grafana_image_full }}"
volumes:
- "{{ node_config_directory }}/monasca-grafana/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "monasca_grafana:/var/lib/grafana/"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ monasca_grafana_default_volumes + monasca_grafana_extra_volumes }}"
dimensions: "{{ monasca_grafana_dimensions }}"
haproxy:
monasca_grafana_server:
@ -286,6 +246,73 @@ monasca_notification_dimensions: "{{ default_container_dimensions }}"
monasca_persister_dimensions: "{{ default_container_dimensions }}"
monasca_grafana_dimensions: "{{ default_container_dimensions }}"
monasca_agent_collector_default_volumes:
- "{{ node_config_directory }}/monasca-agent-collector/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
- "/sys:/sys:ro"
- "/dev/disk/:/dev/disk:ro"
monasca_agent_statsd_default_volumes:
- "{{ node_config_directory }}/monasca-agent-statsd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
monasca_agent_forwarder_default_volumes:
- "{{ node_config_directory }}/monasca-agent-forwarder/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
monasca_api_default_volumes:
- "{{ node_config_directory }}/monasca-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
monasca_log_api_default_volumes:
- "{{ node_config_directory }}/monasca-log-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
monasca_log_transformer_default_volumes:
- "{{ node_config_directory }}/monasca-log-transformer/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
monasca_log_persister_default_volumes:
- "{{ node_config_directory }}/monasca-log-persister/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
monasca_log_metrics_default_volumes:
- "{{ node_config_directory }}/monasca-log-metrics/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
monasca_thresh_default_volumes:
- "{{ node_config_directory }}/monasca-thresh/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "monasca_thresh:/var/lib/monasca-thresh/"
- "kolla_logs:/var/log/kolla"
monasca_notification_default_volumes:
- "{{ node_config_directory }}/monasca-notification/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
monasca_persister_default_volumes:
- "{{ node_config_directory }}/monasca-persister/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
monasca_grafana_default_volumes:
- "{{ node_config_directory }}/monasca-grafana/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "monasca_grafana:/var/lib/grafana/"
- "kolla_logs:/var/log/kolla/"
monasca_extra_volumes: "{{ default_extra_volumes }}"
monasca_agent_collector_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_agent_statsd_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_agent_forwarder_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_api_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_log_api_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_log_transformer_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_log_persister_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_log_metrics_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_thresh_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_notification_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_persister_extra_volumes: "{{ monasca_extra_volumes }}"
monasca_grafana_extra_volumes: "{{ monasca_extra_volumes }}"
####################
# OpenStack
####################

13
ansible/roles/mongodb/defaults/main.yml
View File

@ -8,11 +8,7 @@ mongodb_services:
enabled: true
privileged: True
image: "{{ mongodb_image_full }}"
volumes:
- "{{ node_config_directory }}/mongodb/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "mongodb:/var/lib/mongodb"
volumes: "{{ mongodb_default_volumes + mongodb_extra_volumes }}"
dimensions: "{{ mongodb_dimensions }}"
haproxy:
mongodb:
@ -30,6 +26,13 @@ mongodb_tag: "{{ openstack_release }}"
mongodb_image_full: "{{ mongodb_image }}:{{ mongodb_tag }}"
mongodb_dimensions: "{{ default_container_dimensions }}"
mongodb_default_volumes:
- "{{ node_config_directory }}/mongodb/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "mongodb:/var/lib/mongodb"
mongodb_extra_volumes: "{{ default_extra_volumes }}"
####################
# Mongodb
####################

25
ansible/roles/multipathd/defaults/main.yml
View File

@ -9,17 +9,7 @@ multipathd_services:
ipc_mode: "host"
privileged: True
image: "{{ multipathd_image_full }}"
volumes:
- "{{ node_config_directory }}/multipathd/:{{ 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: "{{ multipathd_default_volumes + multipathd_extra_volumes }}"
####################
@ -28,3 +18,16 @@ multipathd_services:
multipathd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-multipathd"
multipathd_tag: "{{ openstack_release }}"
multipathd_image_full: "{{ multipathd_image }}:{{ multipathd_tag }}"
multipathd_default_volumes:
- "{{ node_config_directory }}/multipathd/:{{ 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"
multipathd_extra_volumes: "{{ default_extra_volumes }}"

13
ansible/roles/opendaylight/defaults/main.yml
View File

@ -9,10 +9,7 @@ opendaylight_services:
privileged: True
group: "opendaylight"
host_in_groups: "{{ inventory_hostname in groups['opendaylight'] }}"
volumes:
- "{{ node_config_directory }}/opendaylight/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ opendaylight_default_volumes + opendaylight_extra_volumes }}"
dimensions: "{{ opendaylight_dimensions }}"
tty: True
haproxy:
@ -53,6 +50,14 @@ opendaylight_tag: "{{ openstack_release }}"
opendaylight_image_full: "{{ opendaylight_image }}:{{ opendaylight_tag }}"
opendaylight_dimensions: "{{ default_container_dimensions }}"
opendaylight_default_volumes:
- "{{ node_config_directory }}/opendaylight/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
opendaylight_extra_volumes: "{{ default_extra_volumes }}"
###################
# Java Opts
###################

33
ansible/roles/openvswitch/defaults/main.yml
View File

@ -15,13 +15,7 @@ openvswitch_services:
or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']
}}
volumes:
- "{{ node_config_directory }}/openvswitch-db-server/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
- "openvswitch_db:/var/lib/openvswitch/"
volumes: "{{ openvswitch_db_default_volumes + openvswitch_db_extra_volumes }}"
dimensions: "{{ openvswitch_db_dimensions }}"
openvswitch-vswitchd:
container_name: "openvswitch_vswitchd"
@ -37,12 +31,7 @@ openvswitch_services:
or inventory_hostname in groups['neutron-metadata-agent']
}}
privileged: True
volumes:
- "{{ node_config_directory }}/openvswitch-vswitchd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ openvswitch_vswitchd_default_volumes + openvswitch_vswitchd_extra_volumes }}"
dimensions: "{{ openvswitch_vswitchd_dimensions }}"
####################
@ -61,3 +50,21 @@ openvswitch_vswitchd_image_full: "{{ openvswitch_vswitchd_image }}:{{ openvswitc
openvswitch_db_dimensions: "{{ default_container_dimensions }}"
openvswitch_vswitchd_dimensions: "{{ default_container_dimensions }}"
openvswitch_db_default_volumes:
- "{{ node_config_directory }}/openvswitch-db-server/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
- "openvswitch_db:/var/lib/openvswitch/"
openvswitch_vswitchd_default_volumes:
- "{{ node_config_directory }}/openvswitch-vswitchd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
openvswitch_extra_volumes: "{{ default_extra_volumes }}"
openvswitch_db_extra_volumes: "{{ openvswitch_extra_volumes }}"
openvswitch_vswitchd_extra_volumes: "{{ openvswitch_extra_volumes }}"

33
ansible/roles/ovs-dpdk/defaults/main.yml
View File

@ -16,12 +16,7 @@ ovsdpdk_services:
or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']
}}
volumes:
- "{{ node_config_directory }}/ovsdpdk-db/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
- "ovsdpdk_db:/var/lib/openvswitch/"
volumes: "{{ ovsdpdk_db_default_volumes + ovsdpdk_db_extra_volumes }}"
dimensions: "{{ ovsdpdk_db_dimensions }}"
ovsdpdk-vswitchd:
container_name: "ovsdpdk_vswitchd"
@ -36,13 +31,7 @@ ovsdpdk_services:
or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']
}}
volumes:
- "{{ node_config_directory }}/ovsdpdk-vswitchd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro"
- "/run:/run:shared"
- "/dev:/dev:shared"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ ovsdpdk_vswitchd_default_volumes + ovsdpdk_vswitchd_extra_volumes }}"
dimensions: "{{ ovsdpdk_vswitchd_dimensions }}"
####################
@ -85,3 +74,21 @@ ovsdpdk_vswitchd_tag: "{{ ovsdpdk_tag }}"
ovsdpdk_vswitchd_image_full: "{{ ovsdpdk_vswitchd_image }}:{{ ovsdpdk_vswitchd_tag }}"
ovsdpdk_db_dimensions: "{{ default_container_dimensions }}"
ovsdpdk_vswitchd_dimensions: "{{ default_container_dimensions }}"
ovsdpdk_db_default_volumes:
- "{{ node_config_directory }}/ovsdpdk-db/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
- "ovsdpdk_db:/var/lib/openvswitch/"
ovsdpdk_vswitchd_default_volumes:
- "{{ node_config_directory }}/ovsdpdk-vswitchd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro"
- "/run:/run:shared"
- "/dev:/dev:shared"
- "kolla_logs:/var/log/kolla/"
ovsdpdk_extra_volumes: "{{ default_extra_volumes }}"
ovsdpdk_db_extra_volumes: "{{ ovsdpdk_extra_volumes }}"
ovsdpdk_vswitchd_extra_volumes: "{{ ovsdpdk_extra_volumes }}"

115
ansible/roles/prometheus/defaults/main.yml
View File

@ -7,11 +7,7 @@ prometheus_services:
group: prometheus
enabled: true
image: "{{ prometheus_server_image_full }}"
volumes:
- "{{ node_config_directory }}/prometheus-server/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "prometheus:/var/lib/prometheus"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ prometheus_server_default_volumes + prometheus_server_extra_volumes }}"
dimensions: "{{ prometheus_server_dimensions }}"
haproxy:
prometheus_server:
@ -25,69 +21,42 @@ prometheus_services:
enabled: "{{ enable_prometheus_node_exporter | bool }}"
image: "{{ prometheus_node_exporter_image_full }}"
pid_mode: "host"
volumes:
- "{{ node_config_directory }}/prometheus-node-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "/proc:/host/proc:ro"
- "/sys:/host/sys:ro"
volumes: "{{ prometheus_node_exporter_default_volumes + prometheus_node_exporter_extra_volumes }}"
dimensions: "{{ prometheus_node_exporter_dimensions }}"
prometheus-mysqld-exporter:
container_name: prometheus_mysqld_exporter
group: prometheus-mysqld-exporter
enabled: "{{ enable_prometheus_mysqld_exporter | bool }}"
image: "{{ prometheus_mysqld_exporter_image_full }}"
volumes:
- "{{ node_config_directory }}/prometheus-mysqld-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ prometheus_mysqld_exporter_default_volumes + prometheus_mysqld_exporter_extra_volumes }}"
dimensions: "{{ prometheus_mysqld_exporter_dimensions }}"
prometheus-haproxy-exporter:
container_name: prometheus_haproxy_exporter
group: prometheus-haproxy-exporter
enabled: "{{ enable_prometheus_haproxy_exporter | bool }}"
image: "{{ prometheus_haproxy_exporter_image_full }}"
volumes:
- "{{ node_config_directory }}/prometheus-haproxy-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "haproxy_socket:/var/lib/kolla/haproxy"
volumes: "{{ prometheus_haproxy_exporter_default_volumes + prometheus_haproxy_exporter_extra_volumes }}"
dimensions: "{{ prometheus_haproxy_exporter_dimensions }}"
prometheus-memcached-exporter:
container_name: prometheus_memcached_exporter
group: prometheus-memcached-exporter
enabled: "{{ enable_prometheus_memcached_exporter | bool }}"
image: "{{ prometheus_memcached_exporter_image_full }}"
volumes:
- "{{ node_config_directory }}/prometheus-memcached-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ prometheus_memcached_exporter_default_volumes + prometheus_memcached_exporter_extra_volumes }}"
dimensions: "{{ prometheus_memcached_exporter_dimensions }}"
prometheus-cadvisor:
container_name: "prometheus_cadvisor"
group: "prometheus-cadvisor"
enabled: "{{ enable_prometheus_cadvisor | bool }}"
image: "{{ prometheus_cadvisor_image_full }}"
volumes:
- "{{ node_config_directory }}/prometheus-cadvisor/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "/:/rootfs:ro"
- "/var/run:/var/run:rw"
- "/sys:/sys:ro"
- "/var/lib/docker/:/var/lib/docker:ro"
- "/dev/disk/:/dev/disk:ro"
volumes: "{{ prometheus_cadvisor_default_volumes + prometheus_cadvisor_extra_volumes }}"
dimensions: "{{ prometheus_cadvisor_dimensions }}"
prometheus-alertmanager:
container_name: "prometheus_alertmanager"
group: "prometheus-alertmanager"
enabled: "{{ enable_prometheus_alertmanager | bool }}"
image: "{{ prometheus_alertmanager_image_full }}"
volumes:
- "{{ node_config_directory }}/prometheus-alertmanager/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "prometheus:/var/lib/prometheus"
volumes: "{{ prometheus_alertmanager_default_volumes + prometheus_alertmanager_extra_volumes }}"
dimensions: "{{ prometheus_alertmanager_dimensions }}"
haproxy:
prometheus_alertmanager:
@ -109,21 +78,14 @@ prometheus_services:
group: "prometheus-openstack-exporter"
enabled: "{{ enable_prometheus_openstack_exporter | bool }}"
image: "{{ prometheus_openstack_exporter_image_full }}"
volumes:
- "{{ node_config_directory }}/prometheus-openstack-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "prometheus:/var/lib/prometheus"
volumes: "{{ prometheus_openstack_exporter_default_volumes + prometheus_openstack_exporter_extra_volumes }}"
dimensions: "{{ prometheus_openstack_exporter_dimensions }}"
prometheus-elasticsearch-exporter:
container_name: prometheus_elasticsearch_exporter
group: prometheus-elasticsearch-exporter
enabled: "{{ enable_prometheus_elasticsearch_exporter | bool }}"
image: "{{ prometheus_elasticsearch_exporter_image_full }}"
volumes:
- "{{ node_config_directory }}/prometheus-elasticsearch-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ prometheus_elasticsearch_exporter_default_volumes + prometheus_elasticsearch_exporter_extra_volumes }}"
dimensions: "{{ prometheus_elasticsearch_exporter_dimensions }}"
####################
@ -183,3 +145,62 @@ prometheus_cadvisor_dimensions: "{{ default_container_dimensions }}"
prometheus_alertmanager_dimensions: "{{ default_container_dimensions }}"
prometheus_openstack_exporter_dimensions: "{{ default_container_dimensions }}"
prometheus_elasticsearch_exporter_dimensions: "{{ default_container_dimensions }}"
prometheus_server_default_volumes:
- "{{ node_config_directory }}/prometheus-server/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "prometheus:/var/lib/prometheus"
- "kolla_logs:/var/log/kolla/"
prometheus_haproxy_exporter_default_volumes:
- "{{ node_config_directory }}/prometheus-haproxy-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "haproxy_socket:/var/lib/kolla/haproxy"
prometheus_mysqld_exporter_default_volumes:
- "{{ node_config_directory }}/prometheus-mysqld-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
prometheus_node_exporter_default_volumes:
- "{{ node_config_directory }}/prometheus-node-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "/proc:/host/proc:ro"
- "/sys:/host/sys:ro"
prometheus_memcached_exporter_default_volumes:
- "{{ node_config_directory }}/prometheus-memcached-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
prometheus_cadvisor_default_volumes:
- "{{ node_config_directory }}/prometheus-cadvisor/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "/:/rootfs:ro"
- "/var/run:/var/run:rw"
- "/sys:/sys:ro"
- "/var/lib/docker/:/var/lib/docker:ro"
- "/dev/disk/:/dev/disk:ro"
prometheus_alertmanager_default_volumes:
- "{{ node_config_directory }}/prometheus-alertmanager/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "prometheus:/var/lib/prometheus"
prometheus_openstack_exporter_default_volumes:
- "{{ node_config_directory }}/prometheus-openstack-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "prometheus:/var/lib/prometheus"
prometheus_elasticsearch_exporter_default_volumes:
- "{{ node_config_directory }}/prometheus-elasticsearch-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
prometheus_extra_volumes: "{{ default_extra_volumes }}"
prometheus_server_extra_volumes: "{{ prometheus_extra_volumes }}"
prometheus_haproxy_exporter_extra_volumes: "{{ prometheus_extra_volumes }}"
prometheus_mysqld_exporter_extra_volumes: "{{ prometheus_extra_volumes }}"
prometheus_node_exporter_extra_volumes: "{{ prometheus_extra_volumes }}"
prometheus_memcached_exporter_extra_volumes: "{{ prometheus_extra_volumes }}"
prometheus_cadvisor_extra_volumes: "{{ prometheus_extra_volumes }}"
prometheus_alertmanager_extra_volumes: "{{ prometheus_extra_volumes }}"
prometheus_openstack_exporter_extra_volumes: "{{ prometheus_extra_volumes }}"
prometheus_elasticsearch_exporter_extra_volumes: "{{ prometheus_extra_volumes }}"

13
ansible/roles/qdrouterd/defaults/main.yml
View File

@ -7,11 +7,7 @@ qdrouterd_services:
group: qdrouterd
enabled: true
image: "{{ qdrouterd_image_full }}"
volumes:
- "{{ node_config_directory }}/qdrouterd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "qdrouterd:/var/lib/qdrouterd/"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ qdrouterd_default_volumes + qdrouterd_extra_volumes }}"
dimensions: "{{ qdrouterd_dimensions }}"
####################
@ -21,3 +17,10 @@ qdrouterd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docke
qdrouterd_tag: "{{ openstack_release }}"
qdrouterd_image_full: "{{ qdrouterd_image }}:{{ qdrouterd_tag }}"
qdrouterd_dimensions: "{{ default_container_dimensions }}"
qdrouterd_default_volumes:
- "{{ node_config_directory }}/qdrouterd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "qdrouterd:/var/lib/qdrouterd/"
- "kolla_logs:/var/log/kolla/"
qdrouterd_extra_volumes: "{{ default_extra_volumes }}"

28
ansible/roles/qinling/defaults/main.yml
View File

@ -7,11 +7,7 @@ qinling_services:
group: qinling-api
enabled: true
image: "{{ qinling_api_image_full }}"
volumes:
- "{{ node_config_directory }}/qinling-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/qinling/qinling:/var/lib/kolla/venv/lib/python2.7/site-packages/qinling' if qinling_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ qinling_api_default_volumes + qinling_api_extra_volumes }}"
dimensions: "{{ qinling_api_dimensions }}"
haproxy:
qinling_api:
@ -29,12 +25,7 @@ qinling_services:
group: qinling-engine
enabled: true
image: "{{ qinling_engine_image_full }}"
volumes:
- "{{ node_config_directory }}/qinling-engine/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "qinling:/var/lib/qinling/"
- "{{ kolla_dev_repos_directory ~ '/qinling/qinling:/var/lib/kolla/venv/lib/python2.7/site-packages/qinling' if qinling_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ qinling_engine_default_volumes + qinling_engine_extra_volumes }}"
dimensions: "{{ qinling_engine_dimensions }}"
@ -63,6 +54,21 @@ qinling_engine_image_full: "{{ qinling_engine_image }}:{{ qinling_engine_tag }}"
qinling_api_dimensions: "{{ default_container_dimensions }}"
qinling_engine_dimensions: "{{ default_container_dimensions }}"
qinling_api_default_volumes:
- "{{ node_config_directory }}/qinling-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/qinling/qinling:/var/lib/kolla/venv/lib/python2.7/site-packages/qinling' if qinling_dev_mod| bool else '' }}"
- "kolla_logs:/var/log/kolla/"
qinling_engine_default_volumes:
- "{{ node_config_directory }}/qinling-engine/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "qinling:/var/lib/qinling/"
- "{{ kolla_dev_repos_directory ~ '/qinling/qinling:/var/lib/kolla/venv/lib/python2.7/site-packages/qinling' if qinling_dev_mod| bool else '' }}"
- "kolla_logs:/var/log/kolla/"
qinling_extra_volumes: "{{ default_extra_volumes }}"
qinling_api_extra_volumes: "{{ qinling_extra_volumes }}"
qinling_engine_extra_volumes: "{{ qinling_extra_volumes }}"
####################
# OpenStack

13
ansible/roles/rabbitmq/defaults/main.yml
View File

@ -16,11 +16,7 @@ rabbitmq_services:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
RABBITMQ_CLUSTER_COOKIE: "{{ role_rabbitmq_cluster_cookie }}"
RABBITMQ_LOG_DIR: "/var/log/kolla/{{ project_name }}"
volumes:
- "{{ node_config_directory }}/{{ project_name }}/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ project_name }}:/var/lib/rabbitmq/"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ rabbitmq_default_volumes + rabbitmq_extra_volumes }}"
dimensions: "{{ rabbitmq_dimensions }}"
haproxy:
rabbitmq_management:
@ -44,7 +40,6 @@ rabbitmq_services:
backend_tcp_extra:
- "timeout server {{ haproxy_outward_rabbitmq_server_timeout }}"
####################
# HAProxy
####################
@ -60,6 +55,12 @@ rabbitmq_tag: "{{ openstack_release }}"
rabbitmq_image_full: "{{ rabbitmq_image }}:{{ rabbitmq_tag }}"
rabbitmq_dimensions: "{{ default_container_dimensions }}"
rabbitmq_default_volumes:
- "{{ node_config_directory }}/{{ project_name }}/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ project_name }}:/var/lib/rabbitmq/"
- "kolla_logs:/var/log/kolla/"
rabbitmq_extra_volumes: "{{ default_extra_volumes }}"
####################
# Message-Broker

11
ansible/roles/rally/defaults/main.yml
View File

@ -7,10 +7,7 @@ rally_services:
image: "{{ rally_image_full }}"
enabled: true
group: "rally"
volumes:
- "{{ node_config_directory }}/rally/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ rally_default_volumes + rally_extra_volumes }}"
dimensions: "{{ rally_dimensions }}"
@ -22,6 +19,12 @@ rally_tag: "{{ openstack_release }}"
rally_image_full: "{{ rally_image }}:{{ rally_tag }}"
rally_dimensions: "{{ default_container_dimensions }}"
rally_default_volumes:
- "{{ node_config_directory }}/rally/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
rally_extra_volumes: "{{ default_extra_volumes }}"
####################
# Database

24
ansible/roles/redis/defaults/main.yml
View File

@ -7,21 +7,14 @@ redis_services:
group: redis
enabled: true
image: "{{ redis_image_full }}"
volumes:
- "{{ node_config_directory }}/redis/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ project_name }}:/var/lib/redis/"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ redis_default_volumes + redis_extra_volumes }}"
dimensions: "{{ redis_dimensions }}"
redis-sentinel:
container_name: redis_sentinel
group: redis
enabled: true
image: "{{ redis_sentinel_image_full }}"
volumes:
- "{{ node_config_directory }}/redis-sentinel/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ redis_sentinel_default_volumes + redis_sentinel_extra_volumes }}"
dimensions: "{{ redis_sentinel_dimensions }}"
####################
@ -36,3 +29,16 @@ redis_sentinel_tag: "{{ openstack_release }}"
redis_sentinel_image_full: "{{ redis_sentinel_image }}:{{ redis_tag }}"
redis_dimensions: "{{ default_container_dimensions }}"
redis_sentinel_dimensions: "{{ default_container_dimensions }}"
redis_default_volumes:
- "{{ node_config_directory }}/redis/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ project_name }}:/var/lib/redis/"
- "kolla_logs:/var/log/kolla/"
redis_sentinel_default_volumes:
- "{{ node_config_directory }}/redis-sentinel/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
redis_extra_volumes: "{{ default_extra_volumes }}"
redis_sentinel_extra_volumes: "{{ default_extra_volumes }}"

22
ansible/roles/searchlight/defaults/main.yml
View File

@ -7,10 +7,7 @@ searchlight_services:
group: searchlight-api
enabled: true
image: "{{ searchlight_api_image_full }}"
volumes:
- "{{ node_config_directory }}/searchlight-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ searchlight_api_default_volumes + searchlight_api_extra_volumes }}"
dimensions: "{{ searchlight_api_dimensions }}"
haproxy:
searchlight_api:
@ -28,10 +25,7 @@ searchlight_services:
group: searchlight-listener
enabled: true
image: "{{ searchlight_listener_image_full }}"
volumes:
- "{{ node_config_directory }}/searchlight-listener/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ searchlight_listener_default_volumes + searchlight_listener_extra_volumes }}"
dimensions: "{{ searchlight_listener_dimensions }}"
####################
@ -56,6 +50,18 @@ searchlight_api_image_full: "{{ searchlight_api_image }}:{{ searchlight_api_tag
searchlight_api_dimensions: "{{ default_container_dimensions }}"
searchlight_listener_dimensions: "{{ default_container_dimensions }}"
searchlight_api_default_volumes:
- "{{ node_config_directory }}/searchlight-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
searchlight_listener_default_volumes:
- "{{ node_config_directory }}/searchlight-listener/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
searchlight_extra_volumes: "{{ default_extra_volumes }}"
searchlight_api_extra_volumes: "{{ searchlight_extra_volumes }}"
searchlight_listener_extra_volumes: "{{ searchlight_extra_volumes }}"
####################
# OpenStack

27
ansible/roles/skydive/defaults/main.yml
View File

@ -7,10 +7,7 @@ skydive_services:
group: skydive-analyzer
enabled: true
image: "{{ skydive_analyzer_image_full }}"
volumes:
- "{{ node_config_directory }}/skydive-analyzer/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ skydive_analyzer_default_volumes + skydive_analyzer_extra_volumes }}"
dimensions: "{{ skydive_analyzer_dimensions }}"
haproxy:
skydive_server:
@ -29,12 +26,7 @@ skydive_services:
enabled: true
image: "{{ skydive_agent_image_full }}"
privileged: True
volumes:
- "{{ node_config_directory }}/skydive-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/var/run/openvswitch:/var/run/openvswitch:ro"
- "/var/run/netns:/host/run:shared"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ skydive_agent_default_volumes + skydive_agent_extra_volumes }}"
dimensions: "{{ skydive_agent_dimensions }}"
####################
@ -49,3 +41,18 @@ skydive_agent_tag: "{{ openstack_release }}"
skydive_agent_image_full: "{{ skydive_agent_image }}:{{ skydive_agent_tag }}"
skydive_analyzer_dimensions: "{{ default_container_dimensions }}"
skydive_agent_dimensions: "{{ default_container_dimensions }}"
skydive_analyzer_default_volumes:
- "{{ node_config_directory }}/skydive-analyzer/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
skydive_agent_default_volumes:
- "{{ node_config_directory }}/skydive-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/var/run/openvswitch:/var/run/openvswitch:ro"
- "/var/run/netns:/host/run:shared"
- "kolla_logs:/var/log/kolla/"
skydive_extra_volumes: "{{ default_extra_volumes }}"
skydive_analyzer_extra_volumes: "{{ skydive_extra_volumes }}"
skydive_agent_extra_volumes: "{{ skydive_extra_volumes }}"

27
ansible/roles/storm/defaults/main.yml
View File

@ -10,11 +10,7 @@ storm_services:
environment:
STORM_LOG_DIR: /var/log/kolla/storm
STORM_LOG4J_PROP: "{{ storm_log_settings }}"
volumes:
- "{{ node_config_directory }}/storm-worker/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "storm:/var/lib/storm/data"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ storm_worker_default_volumes + storm_nimbus_extra_volumes }}"
dimensions: "{{ storm_worker_dimensions }}"
storm-nimbus:
container_name: storm_nimbus
@ -24,11 +20,7 @@ storm_services:
environment:
STORM_LOG_DIR: /var/log/kolla/storm
STORM_LOG4J_PROP: "{{ storm_log_settings }}"
volumes:
- "{{ node_config_directory }}/storm-nimbus/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "storm:/var/lib/storm/data"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ storm_nimbus_default_volumes + storm_nimbus_extra_volumes }}"
dimensions: "{{ storm_nimbus_dimensions }}"
####################
@ -47,3 +39,18 @@ storm_image_full: "{{ storm_image }}:{{ storm_tag }}"
storm_worker_dimensions: "{{ default_container_dimensions }}"
storm_nimbus_dimensions: "{{ default_container_dimensions }}"
storm_worker_default_volumes:
- "{{ node_config_directory }}/storm-worker/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "storm:/var/lib/storm/data"
- "kolla_logs:/var/log/kolla/"
storm_nimbus_default_volumes:
- "{{ node_config_directory }}/storm-nimbus/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "storm:/var/lib/storm/data"
- "kolla_logs:/var/log/kolla/"
storm_extra_volumes: "{{ default_extra_volumes }}"
storm_worker_extra_volumes: "{{ storm_extra_volumes }}"
storm_nimbus_extra_volumes: "{{ storm_extra_volumes }}"

18
ansible/roles/telegraf/defaults/main.yml
View File

@ -8,13 +8,7 @@ telegraf_services:
enabled: true
pid_mode: "host"
group: "telegraf"
volumes:
- "{{ node_config_directory }}/telegraf/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "/sys:/rootfs/sys:ro"
- "/proc:/rootfs/proc:ro"
- "/var/run/docker.sock:/var/run/docker.sock:ro"
volumes: "{{ telegraf_default_volumes + telegraf_extra_volumes }}"
dimensions: "{{ telegraf_dimensions }}"
####################
@ -25,6 +19,16 @@ telegraf_tag: "{{ openstack_release }}"
telegraf_image_full: "{{ telegraf_image }}:{{ telegraf_tag }}"
telegraf_dimensions: "{{ default_container_dimensions }}"
telegraf_default_volumes:
- "{{ node_config_directory }}/telegraf/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "/sys:/rootfs/sys:ro"
- "/proc:/rootfs/proc:ro"
- "/var/run/docker.sock:/var/run/docker.sock:ro"
telegraf_extra_volumes: "{{ default_extra_volumes }}"
####################
# Protocols
####################

12
ansible/roles/tempest/defaults/main.yml
View File

@ -7,10 +7,7 @@ tempest_services:
image: "{{ tempest_image_full }}"
enabled: true
group: "tempest"
volumes:
- "{{ node_config_directory }}/tempest/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ tempest_default_volumes + tempest_extra_volumes }}"
dimensions: "{{ tempest_dimensions }}"
@ -22,6 +19,13 @@ tempest_tag: "{{ openstack_release }}"
tempest_image_full: "{{ tempest_image }}:{{ tempest_tag }}"
tempest_dimensions: "{{ default_container_dimensions }}"
tempest_default_volumes:
- "{{ node_config_directory }}/tempest/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
tempest_extra_volumes: "{{ default_extra_volumes }}"
###########################
# Tempest Required Resource
###########################

10
ansible/roles/vmtp/defaults/main.yml
View File

@ -7,9 +7,7 @@ vmtp_services:
image: "{{ vmtp_image_full }}"
enabled: true
group: "vmtp"
volumes:
- "{{ node_config_directory }}/vmtp/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
volumes: "{{ vmtp_default_volumes + vmtp_extra_volumes }}"
dimensions: "{{ vmtp_dimensions }}"
####################
@ -21,6 +19,12 @@ vmtp_tag: "{{ openstack_release }}"
vmtp_image_full: "{{ vmtp_image }}:{{ vmtp_tag }}"
vmtp_dimensions: "{{ default_container_dimensions }}"
vmtp_default_volumes:
- "{{ node_config_directory }}/vmtp/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
vmtp_extra_volumes: "{{ default_extra_volumes }}"
#########################
# VMTP Specific resources
#########################

14
ansible/roles/zookeeper/defaults/main.yml
View File

@ -10,11 +10,7 @@ zookeeper_services:
environment:
ZOO_LOG_DIR: /var/log/kolla/zookeeper
ZOO_LOG4J_PROP: "{{ zookeeper_log_settings }}"
volumes:
- "{{ node_config_directory }}/zookeeper/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "zookeeper:/var/lib/zookeeper/data"
- "kolla_logs:/var/log/kolla/"
volumes: "{{ zookeeper_default_volumes + zookeeper_extra_volumes }}"
dimensions: "{{ zookeeper_dimensions }}"
####################
@ -30,3 +26,11 @@ zookeeper_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docke
zookeeper_tag: "{{ openstack_release }}"
zookeeper_image_full: "{{ zookeeper_image }}:{{ zookeeper_tag }}"
zookeeper_dimensions: "{{ default_container_dimensions }}"
zookeeper_default_volumes:
- "{{ node_config_directory }}/zookeeper/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro"
- "zookeeper:/var/lib/zookeeper/data"
- "kolla_logs:/var/log/kolla/"
zookeeper_extra_volumes: "{{ default_extra_volumes }}"