summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-04-24 15:48:19 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-04-24 18:06:21 +0100
commit6f8770fbfaf7f297217f69f484193e5a1fcbe986 (patch)
tree3803661cd3c6c8ccd42cc19052b6d415e0e4b15c
parented3db26045041c2e5f25f7a60154740bd93cbd48 (diff)
downloaddefinitions-6f8770fbfaf7f297217f69f484193e5a1fcbe986.tar.gz
Depend on openstack-keystone-setup
Depending on openstack-keystone is wrong, as the admin user, admin tenant, admin role, service tenant and endpoint, are only created after starting and enabling the openstack-keystone service. Not having those created will cause keystone commands executed by some Ansible scripts to fail. Change-Id: I54288f3de2814dbb6639a894d55d7395f052a428
-rw-r--r--openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service4
-rw-r--r--openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service4
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service4
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service4
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-config-setup.service2
-rw-r--r--openstack/usr/lib/systemd/system/openstack-nova-db-setup.service4
-rw-r--r--openstack/usr/lib/systemd/system/swift-controller-setup.service2
-rw-r--r--openstack/usr/lib/systemd/system/swift-proxy.service2
8 files changed, 13 insertions, 13 deletions
diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service
index 5d2f7ea5..5d61fddb 100644
--- a/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service
@@ -1,7 +1,7 @@
[Unit]
Description=Run ceilometer-setup Ansible scripts
-After=postgres-server-setup.service openstack-keystone.service openstack-keystone-setup.service
-Wants=postgres-server-setup.service openstack-keystone.service
+After=postgres-server-setup.service openstack-keystone-setup.service
+Wants=postgres-server-setup.service openstack-keystone-setup.service
[Service]
Type=oneshot
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 bf4a0ad2..1b9d43e0 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-cinder-db-setup.service
@@ -1,8 +1,8 @@
[Unit]
Description=Run cinder-db-setup Ansible scripts
ConditionPathExists=/etc/cinder/cinder.conf
-After=postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone.service openstack-keystone-setup.service
-Wants=postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone.service
+After=postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone-setup.service
+Wants=postgres-server-setup.service openstack-cinder-config-setup.service openstack-keystone-setup.service
[Service]
Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service
index 46e1b585..c7b3b5e0 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-config-setup.service
@@ -1,8 +1,8 @@
[Unit]
Description=Run neutron-config-setup Ansible scripts
ConditionPathExists=/etc/openstack/neutron.conf
-After=openstack-keystone.service openstack-keystone-setup.service
-Wants=openstack-keystone.service
+After=openstack-keystone-setup.service
+Wants=openstack-keystone-setup.service
[Service]
Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service
index 9e4c0bdb..840d0bee 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service
@@ -1,8 +1,8 @@
[Unit]
Description=Run neutron-db-setup Ansible scripts
ConditionPathExists=/etc/openstack/neutron.conf
-After=network-online.target openstack-keystone.service postgres-server-setup.service openstack-keystone-setup.service openstack-neutron-config-setup.service
-Wants=network-online.target openstack-keystone.service postgres-server-setup.service
+After=network-online.target postgres-server-setup.service openstack-keystone-setup.service openstack-neutron-config-setup.service
+Wants=network-online.target postgres-server-setup.service openstack-keystone-setup.service
[Service]
Type=oneshot
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 55416cec..eeb43899 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-config-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-config-setup.service
@@ -1,7 +1,7 @@
[Unit]
Description=Run nova-config-setup Ansible scripts
ConditionPathExists=/etc/openstack/neutron.conf
-After=openstack-keystone.service openstack-keystone-setup.service
+After=openstack-keystone-setup.service
[Service]
Type=oneshot
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 55f1a8ca..a5bd1969 100644
--- a/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service
@@ -1,8 +1,8 @@
[Unit]
Description=Run nova-db-setup Ansible scripts
ConditionPathExists=/etc/openstack/neutron.conf
-After=postgres-server-setup.service openstack-keystone.service openstack-keystone-setup.service openstack-nova-config-setup.service
-Wants=postgres-server-setup.service openstack-keystone.service
+After=postgres-server-setup.service openstack-keystone-setup.service openstack-nova-config-setup.service
+Wants=postgres-server-setup.service openstack-keystone-setup.service
[Service]
Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/swift-controller-setup.service b/openstack/usr/lib/systemd/system/swift-controller-setup.service
index 3da73e7e..558ab13d 100644
--- a/openstack/usr/lib/systemd/system/swift-controller-setup.service
+++ b/openstack/usr/lib/systemd/system/swift-controller-setup.service
@@ -1,6 +1,6 @@
[Unit]
Description=Run swift-controller-setup (once)
-After=local-fs.target postgres-server-setup.service openstack-keystone-setup.service openstack-keystone.service
+After=local-fs.target postgres-server-setup.service openstack-keystone-setup.service
[Service]
Type=oneshot
diff --git a/openstack/usr/lib/systemd/system/swift-proxy.service b/openstack/usr/lib/systemd/system/swift-proxy.service
index bb51d594..0b98634a 100644
--- a/openstack/usr/lib/systemd/system/swift-proxy.service
+++ b/openstack/usr/lib/systemd/system/swift-proxy.service
@@ -1,6 +1,6 @@
[Unit]
Description=OpenStack Swift Proxy Server
-After=syslog.target network.target memcached.service openstack-keystone.service swift-controller-setup.service
+After=syslog.target network.target memcached.service openstack-keystone-setup.service swift-controller-setup.service
[Service]
Type=forking