aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ansible/roles/common/tasks/config.yml1
-rw-r--r--ansible/roles/common/templates/heka-openstack.toml.j210
-rw-r--r--ansible/roles/common/templates/heka.json.j26
-rw-r--r--ansible/roles/common/templates/rsyslog.conf.j218
-rw-r--r--ansible/roles/nova/tasks/bootstrap_service.yml5
-rw-r--r--ansible/roles/nova/tasks/start_compute.yml6
-rw-r--r--ansible/roles/nova/tasks/start_conductors.yml2
-rw-r--r--ansible/roles/nova/tasks/start_controllers.yml10
-rw-r--r--ansible/roles/nova/templates/nova.conf.j23
-rw-r--r--docker/nova/nova-api/extend_start.sh7
-rw-r--r--docker/nova/nova-base/Dockerfile.j27
-rw-r--r--docker/nova/nova-base/extend_start.sh8
-rw-r--r--docker/nova/nova-compute/extend_start.sh8
-rw-r--r--docker/nova/nova-libvirt/extend_start.sh7
14 files changed, 66 insertions, 32 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml
index b50a57852..849315432 100644
--- a/ansible/roles/common/tasks/config.yml
+++ b/ansible/roles/common/tasks/config.yml
@@ -31,3 +31,4 @@
- "global"
- "haproxy"
- "rabbitmq"
+ - "openstack"
diff --git a/ansible/roles/common/templates/heka-openstack.toml.j2 b/ansible/roles/common/templates/heka-openstack.toml.j2
new file mode 100644
index 000000000..5831b30d2
--- /dev/null
+++ b/ansible/roles/common/templates/heka-openstack.toml.j2
@@ -0,0 +1,10 @@
+[openstack_log_decoder]
+type = "SandboxDecoder"
+filename = "lua_decoders/os_openstack_log.lua"
+
+[openstack_logstreamer_input]
+type = "LogstreamerInput"
+decoder = "openstack_log_decoder"
+log_directory = "/var/log/kolla"
+file_match = '(?P<Service>nova)/(?P<Program>.*)\.log'
+differentiator = ["Service", "_", "Program"]
diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2
index c65d0fab2..11f9a1704 100644
--- a/ansible/roles/common/templates/heka.json.j2
+++ b/ansible/roles/common/templates/heka.json.j2
@@ -18,6 +18,12 @@
"dest": "/etc/heka/heka-rabbitmq.toml",
"owner": "heka",
"perm": "0600"
+ },
+ {
+ "source": "{{ container_config_directory }}/heka-openstack.toml",
+ "dest": "/etc/heka/heka-openstack.toml",
+ "owner": "heka",
+ "perm": "0600"
}
]
}
diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2
index e4d6e9ee8..896559be8 100644
--- a/ansible/roles/common/templates/rsyslog.conf.j2
+++ b/ansible/roles/common/templates/rsyslog.conf.j2
@@ -16,24 +16,6 @@ $template GlanceApiFile,"/var/log/glance/glance_api.log"
$template GlanceRegistryFile,"/var/log/glance/glance_registry.log"
:syslogtag,contains,"glance-registry" ?GlanceRegistryFile
-$template NovaApiFile,"/var/log/nova/nova-api.log"
-:syslogtag,contains,"nova-api" ?NovaApiFile
-
-$template NovaConductorFile,"/var/log/nova/nova-conductor.log"
-:syslogtag,contains,"nova-conductor" ?NovaConductorFile
-
-$template NovaConsoleauthFile,"/var/log/nova/nova-consoleauth.log"
-:syslogtag,contains,"nova-consoleauth" ?NovaConsoleauthFile
-
-$template NovaNovncFile,"/var/log/nova/nova-novncproxy.log"
-:syslogtag,contains,"nova-novncproxy" ?NovaNovncFile
-
-$template NovaSchedulerFile,"/var/log/nova/nova-scheduler.log"
-:syslogtag,contains,"nova-scheduler" ?NovaSchedulerFile
-
-$template NovaComputeFile,"/var/log/nova/nova-compute.log"
-:syslogtag,contains,"nova-compute" ?NovaComputeFile
-
$template HeatAPIFile,"/var/log/heat/heat-api.log"
:syslogtag,contains,"heat-api" ?HeatAPIFile
diff --git a/ansible/roles/nova/tasks/bootstrap_service.yml b/ansible/roles/nova/tasks/bootstrap_service.yml
index 787b2787b..3fc61b301 100644
--- a/ansible/roles/nova/tasks/bootstrap_service.yml
+++ b/ansible/roles/nova/tasks/bootstrap_service.yml
@@ -12,7 +12,9 @@
BOOTSTRAP:
name: "bootstrap_nova"
restart_policy: "never"
- volumes: "{{ node_config_directory }}/nova-api/:{{ container_config_directory }}/:ro"
+ volumes:
+ - "{{ node_config_directory }}/nova-api/:{{ container_config_directory }}/:ro"
+ - "kolla_logs:/var/log/kolla/"
run_once: True
delegate_to: "{{ groups['nova-api'][0] }}"
@@ -41,6 +43,7 @@
restart_policy: "never"
volumes:
- "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro"
+ - "kolla_logs:/var/log/kolla/"
- "nova_compute:/var/lib/nova/"
when:
- inventory_hostname in groups['compute']
diff --git a/ansible/roles/nova/tasks/start_compute.yml b/ansible/roles/nova/tasks/start_compute.yml
index bbb8419cb..f3dce9008 100644
--- a/ansible/roles/nova/tasks/start_compute.yml
+++ b/ansible/roles/nova/tasks/start_compute.yml
@@ -27,9 +27,9 @@
- "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro"
- "/lib/modules:/lib/modules:ro"
- "/run:/run"
+ - "kolla_logs:/var/log/kolla/"
- "nova_compute:/var/lib/nova/"
- "nova_libvirt:/var/lib/libvirt"
- - "rsyslog_socket:/var/lib/kolla/rsyslog/"
when:
- inventory_hostname in groups['compute']
- not enable_nova_fake | bool
@@ -42,7 +42,7 @@
name: "nova_compute_ironic"
volumes:
- "{{ node_config_directory }}/nova-compute-ironic/:{{ container_config_directory }}/:ro"
- - "rsyslog_socket:/var/lib/kolla/rsyslog/"
+ - "kolla_logs:/var/log/kolla/"
when:
- inventory_hostname in groups['nova-compute-ironic']
- enable_ironic | bool
@@ -58,7 +58,7 @@
- "{{ node_config_directory }}/nova-compute-fake-{{ item }}/:{{ container_config_directory }}/:ro"
- "/lib/modules:/lib/modules:ro"
- "/run:/run"
- - "rsyslog_socket:/var/lib/kolla/rsyslog/"
+ - "kolla_logs:/var/log/kolla/"
with_sequence: start=1 end={{ num_nova_fake_per_node }}
when:
- inventory_hostname in groups['compute']
diff --git a/ansible/roles/nova/tasks/start_conductors.yml b/ansible/roles/nova/tasks/start_conductors.yml
index 11ebf2ff3..7eb37d44e 100644
--- a/ansible/roles/nova/tasks/start_conductors.yml
+++ b/ansible/roles/nova/tasks/start_conductors.yml
@@ -7,5 +7,5 @@
image: "{{ nova_conductor_image_full }}"
volumes:
- "{{ node_config_directory }}/nova-conductor/:{{ container_config_directory }}/:ro"
- - "rsyslog_socket:/var/lib/kolla/rsyslog/"
+ - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['nova-conductor']
diff --git a/ansible/roles/nova/tasks/start_controllers.yml b/ansible/roles/nova/tasks/start_controllers.yml
index c9b666800..df3642474 100644
--- a/ansible/roles/nova/tasks/start_controllers.yml
+++ b/ansible/roles/nova/tasks/start_controllers.yml
@@ -9,7 +9,7 @@
volumes:
- "{{ node_config_directory }}/nova-api/:{{ container_config_directory }}/:ro"
- "/lib/modules:/lib/modules:ro"
- - "rsyslog_socket:/var/lib/kolla/rsyslog/"
+ - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['nova-api']
- name: Starting nova-consoleauth container
@@ -20,7 +20,7 @@
name: "nova_consoleauth"
volumes:
- "{{ node_config_directory }}/nova-consoleauth/:{{ container_config_directory }}/:ro"
- - "rsyslog_socket:/var/lib/kolla/rsyslog/"
+ - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['nova-consoleauth']
- name: Starting nova-novncproxy container
@@ -31,7 +31,7 @@
name: "nova_novncproxy"
volumes:
- "{{ node_config_directory }}/nova-novncproxy/:{{ container_config_directory }}/:ro"
- - "rsyslog_socket:/var/lib/kolla/rsyslog/"
+ - "kolla_logs:/var/log/kolla/"
when:
- inventory_hostname in groups['nova-novncproxy']
- nova_console == 'novnc'
@@ -44,7 +44,7 @@
name: "nova_scheduler"
volumes:
- "{{ node_config_directory }}/nova-scheduler/:{{ container_config_directory }}/:ro"
- - "rsyslog_socket:/var/lib/kolla/rsyslog/"
+ - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['nova-scheduler']
- name: Starting nova-spicehtml5proxy container
@@ -55,7 +55,7 @@
name: "nova_spicehtml5proxy"
volumes:
- "{{ node_config_directory }}/nova-spicehtml5proxy/:{{ container_config_directory }}/:ro"
- - "rsyslog_socket:/var/lib/kolla/rsyslog/"
+ - "kolla_logs:/var/log/kolla/"
when:
- inventory_hostname in groups['nova-spicehtml5proxy']
- nova_console == 'spice'
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index e99c80209..b872f343d 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -2,8 +2,7 @@
[DEFAULT]
debug = {{ nova_logging_debug }}
-syslog_log_facility=LOG_LOCAL0
-use_syslog=yes
+log_dir = /var/log/kolla/nova
api_paste_config = /etc/nova/api-paste.ini
state_path = /var/lib/nova
diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh
index c7bc9c862..a94a22740 100644
--- a/docker/nova/nova-api/extend_start.sh
+++ b/docker/nova/nova-api/extend_start.sh
@@ -1,5 +1,12 @@
#!/bin/bash
+if [[ ! -d "/var/log/kolla/nova" ]]; then
+ mkdir -p /var/log/kolla/nova
+fi
+if [[ $(stat -c %a /var/log/kolla/nova) != "755" ]]; then
+ chmod 755 /var/log/kolla/nova
+fi
+
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index cb21e1aaf..abf8050b4 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -44,9 +44,9 @@ ADD nova-base-archive /nova-base-source
RUN ln -s nova-base-source/* nova \
&& useradd --user-group nova \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /nova \
- && mkdir -p /etc/nova /var/log/nova /home/nova /var/lib/nova \
+ && mkdir -p /etc/nova /home/nova /var/lib/nova \
&& cp -r /nova/etc/nova/* /etc/nova/ \
- && chown -R nova: /etc/nova /var/log/nova /home/nova /var/lib/nova \
+ && chown -R nova: /etc/nova /home/nova /var/lib/nova \
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/nova/rootwrap.conf
COPY nova_sudoers /etc/sudoers.d/nova_sudoers
@@ -55,4 +55,7 @@ RUN chmod 750 /etc/sudoers.d \
{% endif %}
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start
+
RUN usermod -a -G kolla nova
diff --git a/docker/nova/nova-base/extend_start.sh b/docker/nova/nova-base/extend_start.sh
new file mode 100644
index 000000000..11b4b95d6
--- /dev/null
+++ b/docker/nova/nova-base/extend_start.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/nova" ]]; then
+ mkdir -p /var/log/kolla/nova
+fi
+if [[ $(stat -c %a /var/log/kolla/nova) != "755" ]]; then
+ chmod 755 /var/log/kolla/nova
+fi
diff --git a/docker/nova/nova-compute/extend_start.sh b/docker/nova/nova-compute/extend_start.sh
index efe531ff9..4310189c7 100644
--- a/docker/nova/nova-compute/extend_start.sh
+++ b/docker/nova/nova-compute/extend_start.sh
@@ -1,5 +1,13 @@
#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/nova" ]]; then
+ mkdir -p /var/log/kolla/nova
+fi
+if [[ $(stat -c %a /var/log/kolla/nova) != "755" ]]; then
+ chmod 755 /var/log/kolla/nova
+fi
+
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
diff --git a/docker/nova/nova-libvirt/extend_start.sh b/docker/nova/nova-libvirt/extend_start.sh
index cdfe1f928..3b8084ca8 100644
--- a/docker/nova/nova-libvirt/extend_start.sh
+++ b/docker/nova/nova-libvirt/extend_start.sh
@@ -7,3 +7,10 @@ if [[ -c /dev/kvm ]]; then
chmod 660 /dev/kvm
chown root:kvm /dev/kvm
fi
+
+if [[ ! -d "/var/log/kolla/nova" ]]; then
+ mkdir -p /var/log/kolla/nova
+fi
+if [[ $(stat -c %a /var/log/kolla/nova) != "755" ]]; then
+ chmod 755 /var/log/kolla/nova
+fi
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 22:05:21 +0000