summaryrefslogtreecommitdiff
path: root/openstack/usr/lib/systemd/system
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-04-22 16:39:13 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-04-27 14:47:46 +0000
commit717aef60fccc3c6932f21adf3d9852e710817800 (patch)
treef8a0cb8fc5118a991028b07777f511f6f1330355 /openstack/usr/lib/systemd/system
parenteb2c33af1b56b322524d058dd6f560cb21d98a0d (diff)
downloaddefinitions-717aef60fccc3c6932f21adf3d9852e710817800.tar.gz
ceilometer: Configure ceilometer for multinode deployment
Change-Id: I065dcd8926775c5469830af25c3fc6a49d89e432
Diffstat (limited to 'openstack/usr/lib/systemd/system')
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-api.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-config-setup.service11
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service12
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service11
8 files changed, 28 insertions, 16 deletions
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service
index a6a2ce56..6f9e2adf 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack ceilometer alarm evaluation service
-After=syslog.target network-online.target
+After=syslog.target network-online.target openstack-ceilometer-config-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service
index 1a4a0b04..6452f737 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack ceilometer alarm notification service
-After=syslog.target network-online.target
+After=syslog.target network-online.target openstack-ceilometer-config-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service
index 77d8836d..e0a8d00d 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack ceilometer API service
-After=syslog.target network-online.target
+After=syslog.target network-online.target openstack-ceilometer-config-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service
index 98eff608..bb530360 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack ceilometer collection service
-After=syslog.target network-online.target
+After=syslog.target network-online.target openstack-ceilometer-config-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service
index b321c576..53e36e18 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack ceilometer compute agent
-After=syslog.target network-online.target openstack-ceilometer-collector.service
+After=syslog.target network-online.target openstack-ceilometer-config-setup.service
Wants=network-online.target
[Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-config-setup.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-config-setup.service
new file mode 100644
index 00000000..c3e809d7
--- /dev/null
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-config-setup.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Run ceilometer-config-setup Ansible scripts
+ConditionPathExists=/etc/openstack/ceilometer.conf
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/ceilometer-config.yml
+
+[Install]
+WantedBy=multi-user.target
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service
new file mode 100644
index 00000000..865b4b2c
--- /dev/null
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-db-setup.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Run ceilometer-db-setup Ansible scripts
+ConditionPathExists=/etc/openstack/ceilometer.conf
+After=postgres-server.service openstack-keystone.service openstack-keystone-setup.service openstack-ceilometer-config-setup.service
+Wants=postgres-server.service openstack-keystone.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/ceilometer-db.yml
+
+[Install]
+WantedBy=multi-user.target
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service
deleted file mode 100644
index 5d61fddb..00000000
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Run ceilometer-setup Ansible scripts
-After=postgres-server-setup.service openstack-keystone-setup.service
-Wants=postgres-server-setup.service openstack-keystone-setup.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/ceilometer.yml
-
-[Install]
-WantedBy=multi-user.target