diff options
Diffstat (limited to 'openstack/usr')
-rw-r--r-- | openstack/usr/lib/systemd/system/iscsi-setup.service (renamed from openstack/usr/lib/systemd/system/openstack-cinder-iscsi-setup.service) | 4 | ||||
-rw-r--r-- | openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service | 2 | ||||
-rw-r--r-- | openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service | 2 | ||||
-rw-r--r-- | openstack/usr/lib/systemd/system/openstack-ceilometer-api.service | 2 | ||||
-rw-r--r-- | openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service | 2 | ||||
-rw-r--r-- | openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service | 3 | ||||
-rw-r--r-- | openstack/usr/lib/systemd/system/openstack-cinder-setup.service | 9 | ||||
-rw-r--r-- | openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service | 2 | ||||
-rw-r--r-- | openstack/usr/lib/systemd/system/openstack-nova-db-setup.service | 2 | ||||
-rw-r--r-- | openstack/usr/share/openstack/iscsi.yml (renamed from openstack/usr/share/openstack/cinder-iscsi.yml) | 0 |
10 files changed, 10 insertions, 18 deletions
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-iscsi-setup.service b/openstack/usr/lib/systemd/system/iscsi-setup.service index 157f30fc..c9e5ee59 100644 --- a/openstack/usr/lib/systemd/system/openstack-cinder-iscsi-setup.service +++ b/openstack/usr/lib/systemd/system/iscsi-setup.service @@ -1,12 +1,12 @@ [Unit] -Description=Run cinder-iscsi-setup Ansible scripts +Description=Run iscsi-setup Ansible scripts Before=iscsid.service target.service Wants= iscsid.service target.service [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/cinder-iscsi.yml +ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/iscsi.yml [Install] WantedBy=multi-user.target 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 1976417c..a6a2ce56 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 openstack-ceilometer-setup.service +After=syslog.target network-online.target 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 070d063d..1a4a0b04 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 openstack-ceilometer-setup.service +After=syslog.target network-online.target 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 3981553b..77d8836d 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 openstack-ceilometer-setup.service +After=syslog.target network-online.target 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 c7171451..98eff608 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 openstack-ceilometer-setup.service +After=syslog.target network-online.target Wants=network-online.target [Service] diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service index 9936c822..16eacb55 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service @@ -1,6 +1,7 @@ [Unit] Description=Run ceilometer-setup Ansible scripts -After=local-fs.target openstack-keystone-setup.service postgres-server.service openstack-cinder-setup.service openstack-nova-setup.service openstack-neutron-setup.service openstack-glance-setup.service +After=postgres-server.service openstack-keystone.service openstack-keystone-setup.service +Wants=postgres-server.service openstack-keystone.service [Service] Type=oneshot diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-setup.service b/openstack/usr/lib/systemd/system/openstack-cinder-setup.service deleted file mode 100644 index bac80b6b..00000000 --- a/openstack/usr/lib/systemd/system/openstack-cinder-setup.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run cinder-setup Ansible scripts -After=local-fs.target openstack-keystone-setup.service postgres-server.service - -[Service] -ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/cinder.yml - -[Install] -WantedBy=multi-user.target 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 4b30e78a..68874a6e 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service @@ -1,7 +1,7 @@ [Unit] Description=Run neutron-db-setup Ansible scripts ConditionPathExists=/etc/openstack/neutron.conf -After=network-online.target openstack-keystone.service postgres-server.service openstack-keystone-setup.service +After=network-online.target openstack-keystone.service postgres-server.service openstack-keystone-setup.service openstack-neutron-config-setup.service Wants=network-online.target openstack-keystone.service postgres-server.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 80db0be5..5a280917 100644 --- a/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service +++ b/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service @@ -1,7 +1,7 @@ [Unit] Description=Run nova-db-setup Ansible scripts ConditionPathExists=/etc/openstack/neutron.conf -After=postgres-server.service openstack-keystone.service openstack-keystone-setup.service +After=postgres-server.service openstack-keystone.service openstack-keystone-setup.service openstack-nova-config-setup.service Wants=postgres-server.service openstack-keystone.service [Service] diff --git a/openstack/usr/share/openstack/cinder-iscsi.yml b/openstack/usr/share/openstack/iscsi.yml index b80377ae..b80377ae 100644 --- a/openstack/usr/share/openstack/cinder-iscsi.yml +++ b/openstack/usr/share/openstack/iscsi.yml |