openstack: add missing ConditionPathExists

And fix some existing as well.  Generate a separate postgres.conf file
so that we don't have to reference keystone on the postgres setup
systemd unit and Ansible script.

Change-Id: I0bb4428b7e88a508a37d1d43ddcd266369b05cd2

18 files changed, 18 insertions, 3 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 ec972f85..627d261a 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack ceilometer alarm evaluation service
+ConditionPathExists=/etc/ceilometer/ceilometer.conf
 After=syslog.target network-online.target openstack-ceilometer-config-setup.service
 Wants=network-online.target
 
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 30a94443..c30420ed 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack ceilometer alarm notification service
+ConditionPathExists=/etc/ceilometer/ceilometer.conf
 After=syslog.target network-online.target openstack-ceilometer-config-setup.service
 Wants=network-online.target
 
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service
index f5bd480c..8a6c44d9 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack ceilometer API service
+ConditionPathExists=/etc/ceilometer/ceilometer.conf
 After=syslog.target network-online.target openstack-ceilometer-config-setup.service
 Wants=network-online.target
 
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service
index 05b91893..48d6e5f6 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-central.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack ceilometer central agent
+ConditionPathExists=/etc/ceilometer/ceilometer.conf
 After=syslog.target network-online.target openstack-ceilometer-collector.service
 Wants=network-online.target
 
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service
index 5941c20e..d1de528d 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack ceilometer collection service
+ConditionPathExists=/etc/ceilometer/ceilometer.conf
 After=syslog.target network-online.target openstack-ceilometer-config-setup.service
 Wants=network-online.target
 
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service
index 5dee8946..95c6d87d 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-compute.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack ceilometer compute agent
+ConditionPathExists=/etc/ceilometer/ceilometer.conf
 After=syslog.target network-online.target openstack-ceilometer-config-setup.service
 Wants=network-online.target
 
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service
index c78b3e30..3385ec9f 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-notification.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack ceilometer notification agent
+ConditionPathExists=/etc/ceilometer/ceilometer.conf
 After=syslog.target network-online.target openstack-ceilometer-collector.service
 Wants=network-online.target
 
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service b/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
index d0568c70..cc99d0cb 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Run cinder-db-setup Ansible scripts
-ConditionPathExists=/etc/cinder/cinder.conf
+ConditionPathExists=/etc/openstack/cinder.conf
 After=postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone-setup.service
 
 [Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-glance-api.service b/openstack/usr/lib/systemd/system/openstack-glance-api.service
index e1387118..dc9fd2fd 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-api.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack Image Service (code-named Glance) API server
+ConditionPathExists=/etc/glance/glance-api.conf
 After=syslog.target network-online.target
 Wants=network-online.target
 
diff --git a/openstack/usr/lib/systemd/system/openstack-glance-registry.service b/openstack/usr/lib/systemd/system/openstack-glance-registry.service
index f3134352..b2cc8b49 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-registry.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-registry.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack Image Service (code-named Glance) Registry server
+ConditionPathExists=/etc/glance/glance-registry.conf
 After=syslog.target network-online.target
 Wants=network-online.target
 
diff --git a/openstack/usr/lib/systemd/system/openstack-glance-setup.service b/openstack/usr/lib/systemd/system/openstack-glance-setup.service
index 8fec1cfb..b4ec3f02 100644
--- a/openstack/usr/lib/systemd/system/openstack-glance-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-glance-setup.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Run glance-setup Ansible scripts
+ConditionPathExists=/etc/openstack/glance.conf
 After=local-fs.target openstack-keystone-setup.service postgres-server-setup.service
 
 [Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-ironic-api.service b/openstack/usr/lib/systemd/system/openstack-ironic-api.service
index 83d56787..8d05d424 100644
--- a/openstack/usr/lib/systemd/system/openstack-ironic-api.service
+++ b/openstack/usr/lib/systemd/system/openstack-ironic-api.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack Bare Metal Provisioning Service (code-named Ironic) API server
+ConditionPathExists=/etc/ironic/ironic.conf
 After=syslog.target network-online.target
 Wants=network-online.target
 
diff --git a/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service b/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service
index f276f6f0..8ce3f840 100644
--- a/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service
+++ b/openstack/usr/lib/systemd/system/openstack-ironic-conductor.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OpenStack Bare Metal Provisioning Service (code-named Ironic) Conductor server
+ConditionPathExists=/etc/ironic/ironic.conf
 After=syslog.target network-online.target
 Wants=network-online.target
 
diff --git a/openstack/usr/lib/systemd/system/openstack-ironic-setup.service b/openstack/usr/lib/systemd/system/openstack-ironic-setup.service
index 5560b881..6d118f18 100644
--- a/openstack/usr/lib/systemd/system/openstack-ironic-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-ironic-setup.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Run ironic-setup Ansible scripts
+ConditionPathExists=/etc/openstack/ironic.conf
 After=local-fs.target openstack-keystone-setup.service postgres-server-setup.service
 
 [Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-keystone.service b/openstack/usr/lib/systemd/system/openstack-keystone.service
index 0aa9e1ef..9e791659 100644
--- a/openstack/usr/lib/systemd/system/openstack-keystone.service
+++ b/openstack/usr/lib/systemd/system/openstack-keystone.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenStack Identity Service (code-named Keystone)
 After=syslog.target network-online.target
+ConditionPathExists=/etc/keystone/keystone.conf
 Wants=network-online.target
 
 [Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-config-setup.service b/openstack/usr/lib/systemd/system/openstack-nova-config-setup.service
index eeb43899..2813081e 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-config-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-config-setup.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Run nova-config-setup Ansible scripts
-ConditionPathExists=/etc/openstack/neutron.conf
+ConditionPathExists=/etc/openstack/nova.conf
 After=openstack-keystone-setup.service
 
 [Service]
diff --git a/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service b/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service
index ee405279..238df3c7 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Run nova-db-setup Ansible scripts
-ConditionPathExists=/etc/openstack/neutron.conf
+ConditionPathExists=/etc/openstack/nova.conf
 After=postgres-server-setup.service openstack-keystone-setup.service openstack-nova-config-setup.service
 
 [Service]
diff --git a/openstack/usr/lib/systemd/system/postgres-server-setup.service b/openstack/usr/lib/systemd/system/postgres-server-setup.service
index 5bb70eb7..a185db3d 100644
--- a/openstack/usr/lib/systemd/system/postgres-server-setup.service
+++ b/openstack/usr/lib/systemd/system/postgres-server-setup.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Run postgres-setup Ansible scripts
+ConditionPathExists=/etc/openstack/postgres.conf
 After=local-fs.target
 
 [Service]