From 46ea33a2fe458a5970332db03da0afe381149c6a Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Mon, 16 Mar 2015 15:12:14 +0000 Subject: Move systemd units to /usr/lib/systemd/system as defined in systemd documentation See http://www.freedesktop.org/software/systemd/man/systemd.unit.html for more information --- openstack-cinder.configure | 2 +- openstack-glance.configure | 2 +- openstack-keystone.configure | 4 +- openstack-neutron.configure | 2 +- openstack-nova.configure | 2 +- openstack/etc/systemd/system/apache-httpd.service | 15 ----- .../systemd/system/openstack-cinder-api.service | 11 ---- .../systemd/system/openstack-cinder-backup.service | 11 ---- .../system/openstack-cinder-scheduler.service | 11 ---- .../systemd/system/openstack-cinder-setup.service | 9 --- .../systemd/system/openstack-cinder-volume.service | 11 ---- .../systemd/system/openstack-glance-api.service | 12 ---- .../system/openstack-glance-registry.service | 12 ---- .../systemd/system/openstack-glance-setup.service | 9 --- .../systemd/system/openstack-horizon-setup.service | 9 --- .../system/openstack-keystone-setup.service | 12 ---- .../etc/systemd/system/openstack-keystone.service | 12 ---- .../system/openstack-neutron-dhcp-agent.service | 14 ----- .../system/openstack-neutron-l3-agent.service | 15 ----- .../openstack-neutron-metadata-agent.service | 14 ----- ...-neutron-network-configuration-one-node.service | 13 ---- .../system/openstack-neutron-ovs-cleanup.service | 14 ----- ...nstack-neutron-plugin-openvswitch-agent.service | 14 ----- .../system/openstack-neutron-server.service | 15 ----- .../systemd/system/openstack-neutron-setup.service | 13 ---- .../etc/systemd/system/openstack-nova-api.service | 11 ---- .../etc/systemd/system/openstack-nova-cert.service | 11 ---- .../systemd/system/openstack-nova-compute.service | 12 ---- .../system/openstack-nova-conductor.service | 12 ---- .../system/openstack-nova-consoleauth.service | 11 ---- .../system/openstack-nova-novncproxy.service | 11 ---- .../system/openstack-nova-scheduler.service | 11 ---- .../systemd/system/openstack-nova-setup.service | 9 --- .../openvswitch-create-links-one-node.service | 14 ----- .../systemd/system/openvswitch-db-server.service | 11 ---- .../system/openvswitch-initialize-db.service | 10 ---- .../etc/systemd/system/openvswitch-setup.service | 11 ---- openstack/etc/systemd/system/openvswitch.service | 10 ---- .../etc/systemd/system/postgres-server.service | 24 -------- .../etc/systemd/system/rabbitmq-server.service | 15 ----- openstack/manifest | 70 +++++++++++----------- .../usr/lib/systemd/system/apache-httpd.service | 15 +++++ .../systemd/system/openstack-cinder-api.service | 11 ++++ .../systemd/system/openstack-cinder-backup.service | 11 ++++ .../system/openstack-cinder-scheduler.service | 11 ++++ .../systemd/system/openstack-cinder-setup.service | 9 +++ .../systemd/system/openstack-cinder-volume.service | 11 ++++ .../systemd/system/openstack-glance-api.service | 12 ++++ .../system/openstack-glance-registry.service | 12 ++++ .../systemd/system/openstack-glance-setup.service | 9 +++ .../systemd/system/openstack-horizon-setup.service | 9 +++ .../system/openstack-keystone-setup.service | 12 ++++ .../lib/systemd/system/openstack-keystone.service | 12 ++++ .../system/openstack-neutron-dhcp-agent.service | 14 +++++ .../system/openstack-neutron-l3-agent.service | 15 +++++ .../openstack-neutron-metadata-agent.service | 14 +++++ ...-neutron-network-configuration-one-node.service | 13 ++++ .../system/openstack-neutron-ovs-cleanup.service | 14 +++++ ...nstack-neutron-plugin-openvswitch-agent.service | 14 +++++ .../system/openstack-neutron-server.service | 15 +++++ .../systemd/system/openstack-neutron-setup.service | 13 ++++ .../lib/systemd/system/openstack-nova-api.service | 11 ++++ .../lib/systemd/system/openstack-nova-cert.service | 11 ++++ .../systemd/system/openstack-nova-compute.service | 12 ++++ .../system/openstack-nova-conductor.service | 12 ++++ .../system/openstack-nova-consoleauth.service | 11 ++++ .../system/openstack-nova-novncproxy.service | 11 ++++ .../system/openstack-nova-scheduler.service | 11 ++++ .../systemd/system/openstack-nova-setup.service | 9 +++ .../openvswitch-create-links-one-node.service | 14 +++++ .../systemd/system/openvswitch-db-server.service | 11 ++++ .../system/openvswitch-initialize-db.service | 10 ++++ .../lib/systemd/system/openvswitch-setup.service | 11 ++++ .../usr/lib/systemd/system/openvswitch.service | 10 ++++ .../usr/lib/systemd/system/postgres-server.service | 24 ++++++++ .../usr/lib/systemd/system/rabbitmq-server.service | 15 +++++ 76 files changed, 470 insertions(+), 470 deletions(-) delete mode 100644 openstack/etc/systemd/system/apache-httpd.service delete mode 100644 openstack/etc/systemd/system/openstack-cinder-api.service delete mode 100644 openstack/etc/systemd/system/openstack-cinder-backup.service delete mode 100644 openstack/etc/systemd/system/openstack-cinder-scheduler.service delete mode 100644 openstack/etc/systemd/system/openstack-cinder-setup.service delete mode 100644 openstack/etc/systemd/system/openstack-cinder-volume.service delete mode 100644 openstack/etc/systemd/system/openstack-glance-api.service delete mode 100644 openstack/etc/systemd/system/openstack-glance-registry.service delete mode 100644 openstack/etc/systemd/system/openstack-glance-setup.service delete mode 100644 openstack/etc/systemd/system/openstack-horizon-setup.service delete mode 100644 openstack/etc/systemd/system/openstack-keystone-setup.service delete mode 100644 openstack/etc/systemd/system/openstack-keystone.service delete mode 100644 openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service delete mode 100644 openstack/etc/systemd/system/openstack-neutron-l3-agent.service delete mode 100644 openstack/etc/systemd/system/openstack-neutron-metadata-agent.service delete mode 100644 openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service delete mode 100644 openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service delete mode 100644 openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service delete mode 100644 openstack/etc/systemd/system/openstack-neutron-server.service delete mode 100644 openstack/etc/systemd/system/openstack-neutron-setup.service delete mode 100644 openstack/etc/systemd/system/openstack-nova-api.service delete mode 100644 openstack/etc/systemd/system/openstack-nova-cert.service delete mode 100644 openstack/etc/systemd/system/openstack-nova-compute.service delete mode 100644 openstack/etc/systemd/system/openstack-nova-conductor.service delete mode 100644 openstack/etc/systemd/system/openstack-nova-consoleauth.service delete mode 100644 openstack/etc/systemd/system/openstack-nova-novncproxy.service delete mode 100644 openstack/etc/systemd/system/openstack-nova-scheduler.service delete mode 100644 openstack/etc/systemd/system/openstack-nova-setup.service delete mode 100644 openstack/etc/systemd/system/openvswitch-create-links-one-node.service delete mode 100644 openstack/etc/systemd/system/openvswitch-db-server.service delete mode 100644 openstack/etc/systemd/system/openvswitch-initialize-db.service delete mode 100644 openstack/etc/systemd/system/openvswitch-setup.service delete mode 100644 openstack/etc/systemd/system/openvswitch.service delete mode 100644 openstack/etc/systemd/system/postgres-server.service delete mode 100644 openstack/etc/systemd/system/rabbitmq-server.service create mode 100644 openstack/usr/lib/systemd/system/apache-httpd.service create mode 100644 openstack/usr/lib/systemd/system/openstack-cinder-api.service create mode 100644 openstack/usr/lib/systemd/system/openstack-cinder-backup.service create mode 100644 openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service create mode 100644 openstack/usr/lib/systemd/system/openstack-cinder-setup.service create mode 100644 openstack/usr/lib/systemd/system/openstack-cinder-volume.service create mode 100644 openstack/usr/lib/systemd/system/openstack-glance-api.service create mode 100644 openstack/usr/lib/systemd/system/openstack-glance-registry.service create mode 100644 openstack/usr/lib/systemd/system/openstack-glance-setup.service create mode 100644 openstack/usr/lib/systemd/system/openstack-horizon-setup.service create mode 100644 openstack/usr/lib/systemd/system/openstack-keystone-setup.service create mode 100644 openstack/usr/lib/systemd/system/openstack-keystone.service create mode 100644 openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service create mode 100644 openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service create mode 100644 openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service create mode 100644 openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service create mode 100644 openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service create mode 100644 openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service create mode 100644 openstack/usr/lib/systemd/system/openstack-neutron-server.service create mode 100644 openstack/usr/lib/systemd/system/openstack-neutron-setup.service create mode 100644 openstack/usr/lib/systemd/system/openstack-nova-api.service create mode 100644 openstack/usr/lib/systemd/system/openstack-nova-cert.service create mode 100644 openstack/usr/lib/systemd/system/openstack-nova-compute.service create mode 100644 openstack/usr/lib/systemd/system/openstack-nova-conductor.service create mode 100644 openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service create mode 100644 openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service create mode 100644 openstack/usr/lib/systemd/system/openstack-nova-scheduler.service create mode 100644 openstack/usr/lib/systemd/system/openstack-nova-setup.service create mode 100644 openstack/usr/lib/systemd/system/openvswitch-create-links-one-node.service create mode 100644 openstack/usr/lib/systemd/system/openvswitch-db-server.service create mode 100644 openstack/usr/lib/systemd/system/openvswitch-initialize-db.service create mode 100644 openstack/usr/lib/systemd/system/openvswitch-setup.service create mode 100644 openstack/usr/lib/systemd/system/openvswitch.service create mode 100644 openstack/usr/lib/systemd/system/postgres-server.service create mode 100644 openstack/usr/lib/systemd/system/rabbitmq-server.service diff --git a/openstack-cinder.configure b/openstack-cinder.configure index f3d07477..79d2f6f4 100644 --- a/openstack-cinder.configure +++ b/openstack-cinder.configure @@ -21,7 +21,7 @@ ROOT="$1" ########################################################################## -ln -sf "/etc/systemd/system/openstack-cinder-setup.service" \ +ln -sf "/usr/lib/systemd/system/openstack-cinder-setup.service" \ "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-cinder-setup.service" ########################################################################## diff --git a/openstack-glance.configure b/openstack-glance.configure index 7051f156..69020f10 100644 --- a/openstack-glance.configure +++ b/openstack-glance.configure @@ -21,7 +21,7 @@ ROOT="$1" ########################################################################## -ln -s "/etc/systemd/system/openstack-glance-setup.service" \ +ln -s "/usr/lib/systemd/system/openstack-glance-setup.service" \ "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-glance-setup.service" ########################################################################## diff --git a/openstack-keystone.configure b/openstack-keystone.configure index 73dbd7e0..992ef0f8 100644 --- a/openstack-keystone.configure +++ b/openstack-keystone.configure @@ -21,10 +21,10 @@ ROOT="$1" ########################################################################## -ln -s "/etc/systemd/system/openstack-keystone-setup.service" \ +ln -s "/usr/lib/systemd/system/openstack-keystone-setup.service" \ "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-keystone-setup.service" -ln -s "/etc/systemd/system/openstack-horizon-setup.service" \ +ln -s "/usr/lib/systemd/system/openstack-horizon-setup.service" \ "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-horizon-setup.service" ########################################################################## diff --git a/openstack-neutron.configure b/openstack-neutron.configure index 71b29713..d0f425dc 100644 --- a/openstack-neutron.configure +++ b/openstack-neutron.configure @@ -54,6 +54,6 @@ services=("openstack-neutron-network-configuration-one-node.service" \ "openstack-neutron-setup.service") for service in ${services[@]}; do - ln -sf "/etc/systemd/system/$service" \ + ln -sf "/usr/lib/systemd/system/$service" \ "$ROOT/etc/systemd/system/multi-user.target.wants/$service" done diff --git a/openstack-nova.configure b/openstack-nova.configure index 0c231198..e04527cc 100644 --- a/openstack-nova.configure +++ b/openstack-nova.configure @@ -21,7 +21,7 @@ ROOT="$1" ########################################################################## -ln -s "/etc/systemd/system/openstack-nova-setup.service" \ +ln -s "/usr/lib/systemd/system/openstack-nova-setup.service" \ "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-nova-setup.service" ########################################################################## diff --git a/openstack/etc/systemd/system/apache-httpd.service b/openstack/etc/systemd/system/apache-httpd.service deleted file mode 100644 index f1211ac9..00000000 --- a/openstack/etc/systemd/system/apache-httpd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Apache Web Server -After=network.target remote-fs.target nss-lookup.target - -[Service] -Type=forking -PIDFile=/var/run/httpd.pid -ExecStart=/usr/sbin/apachectl start -ExecStop=/usr/sbin/apachectl graceful-stop -ExecReload=/usr/sbin/apachectl graceful -PrivateTmp=true -LimitNOFILE=infinity - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-cinder-api.service b/openstack/etc/systemd/system/openstack-cinder-api.service deleted file mode 100644 index a4a100f8..00000000 --- a/openstack/etc/systemd/system/openstack-cinder-api.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Volume Service (code-named Cinder) API server -After=syslog.target network.target - -[Service] -Type=simple -User=cinder -ExecStart=/usr/bin/cinder-api --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-cinder-backup.service b/openstack/etc/systemd/system/openstack-cinder-backup.service deleted file mode 100644 index a8f09ae0..00000000 --- a/openstack/etc/systemd/system/openstack-cinder-backup.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Cinder backup server -After=syslog.target network.target - -[Service] -Type=simple -User=cinder -ExecStart=/usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-backup.log - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-cinder-scheduler.service b/openstack/etc/systemd/system/openstack-cinder-scheduler.service deleted file mode 100644 index feff70f4..00000000 --- a/openstack/etc/systemd/system/openstack-cinder-scheduler.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Cinder scheduler server -After=syslog.target network.target - -[Service] -Type=simple -User=cinder -ExecStart=/usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-cinder-setup.service b/openstack/etc/systemd/system/openstack-cinder-setup.service deleted file mode 100644 index b166674b..00000000 --- a/openstack/etc/systemd/system/openstack-cinder-setup.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run cinder-setup Ansile 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/etc/systemd/system/openstack-cinder-volume.service b/openstack/etc/systemd/system/openstack-cinder-volume.service deleted file mode 100644 index 8852c90f..00000000 --- a/openstack/etc/systemd/system/openstack-cinder-volume.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Cinder volume server -After=syslog.target network.target - -[Service] -Type=simple -User=cinder -ExecStart=/usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-glance-api.service b/openstack/etc/systemd/system/openstack-glance-api.service deleted file mode 100644 index 7958f84c..00000000 --- a/openstack/etc/systemd/system/openstack-glance-api.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Image Service (code-named Glance) API server -After=syslog.target network.target - -[Service] -Type=simple -User=glance -ExecStart=/usr/bin/glance-api --config-file /etc/glance/glance-api.conf - -[Install] -WantedBy=multi-user.target - diff --git a/openstack/etc/systemd/system/openstack-glance-registry.service b/openstack/etc/systemd/system/openstack-glance-registry.service deleted file mode 100644 index 18a60ae1..00000000 --- a/openstack/etc/systemd/system/openstack-glance-registry.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Image Service (code-named Glance) Registry server -After=syslog.target network.target - -[Service] -Type=simple -User=glance -ExecStart=/usr/bin/glance-registry --config-file /etc/glance/glance-registry.conf - -[Install] -WantedBy=multi-user.target - diff --git a/openstack/etc/systemd/system/openstack-glance-setup.service b/openstack/etc/systemd/system/openstack-glance-setup.service deleted file mode 100644 index c00c520c..00000000 --- a/openstack/etc/systemd/system/openstack-glance-setup.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run glance-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/glance.yml - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-horizon-setup.service b/openstack/etc/systemd/system/openstack-horizon-setup.service deleted file mode 100644 index 9805a38f..00000000 --- a/openstack/etc/systemd/system/openstack-horizon-setup.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run horizon-setup Ansible scripts -After=local-fs.target - -[Service] -ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/horizon.yml - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-keystone-setup.service b/openstack/etc/systemd/system/openstack-keystone-setup.service deleted file mode 100644 index 9ea04c1d..00000000 --- a/openstack/etc/systemd/system/openstack-keystone-setup.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Run keystone-setup Ansible scripts -After=local-fs.target postgres-server.service -ConditionPathExists=/etc/openstack/keystone.conf - -[Service] -# Oneshot, since others setup have to wait until this service finishes -Type=oneshot -ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/keystone.yml - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-keystone.service b/openstack/etc/systemd/system/openstack-keystone.service deleted file mode 100644 index 82b2d078..00000000 --- a/openstack/etc/systemd/system/openstack-keystone.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Identity Service (code-named Keystone) -After=syslog.target network.target - -[Service] -Type=notify -Restart=always -User=keystone -ExecStart=/usr/bin/keystone-all --config-file /etc/keystone/keystone.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service b/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service deleted file mode 100644 index a86b7a0a..00000000 --- a/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Neutron DHCP Agent -After=network-online.target openstack-neutron-ovs-cleanup.service - -[Service] -Type=simple -User=neutron -ExecStart=/usr/bin/neutron-dhcp-agent \ - --config-file=/etc/neutron/neutron.conf \ - --config-file=/etc/neutron/dhcp_agent.ini \ - --log-file=/var/log/neutron/dhcp-agent.log - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-l3-agent.service b/openstack/etc/systemd/system/openstack-neutron-l3-agent.service deleted file mode 100644 index 7fe12f46..00000000 --- a/openstack/etc/systemd/system/openstack-neutron-l3-agent.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Neutron Layer 3 Agent -After=network-online.target openstack-neutron-ovs-cleanup.service - -[Service] -Type=simple -User=neutron -ExecStart=/usr/bin/neutron-l3-agent \ - --config-file=/etc/neutron/neutron.conf \ - --config-file=/etc/neutron/l3_agent.ini \ - --config-file=/etc/neutron/fwaas_driver.ini \ - --log-file=/var/log/neutron/l3-agent.log - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service b/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service deleted file mode 100644 index 15fd406f..00000000 --- a/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Neutron Metadata Plugin Agent -After=network-online.target openstack-neutron-setup.service - -[Service] -Type=simple -User=neutron -ExecStart=/usr/bin/neutron-metadata-agent \ - --config-file=/etc/neutron/neutron.conf \ - --config-file=/etc/neutron/metadata_agent.ini \ - --log-file=/var/log/neutron/metadata-agent.log - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service b/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service deleted file mode 100644 index 2b1d168b..00000000 --- a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Configuration script to set Openstack in one node networking -Wants=network-online.target -After=network-online.target openvswitch.service - -[Service] -Type=oneshot -ExecStart=/usr/share/openstack/openstack-neutron-network-configuration-for-one-node -Restart=no -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service deleted file mode 100644 index 5eaf8a30..00000000 --- a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Neutron OVS cleanup -After=network-online.target openstack-neutron-setup.service -ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup - -[Service] -Type=simple -User=neutron -ExecStart=/usr/bin/neutron-ovs-cleanup \ - --log-file /var/log/neutron/ovs-cleanup.log \ - --config-file /etc/neutron/neutron.conf --verbose - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service b/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service deleted file mode 100644 index 12498cc9..00000000 --- a/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Neutron OpenvSwitch Plugin Agent -After=network-online.target openstack-neutron-setup.service - -[Service] -Type=simple -User=neutron -ExecStart=/usr/bin/neutron-openvswitch-agent \ - --config-file=/etc/neutron/neutron.conf \ - --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini \ - --log-file=/var/log/neutron/openvswitch-agent.log - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-server.service b/openstack/etc/systemd/system/openstack-neutron-server.service deleted file mode 100644 index b9484b94..00000000 --- a/openstack/etc/systemd/system/openstack-neutron-server.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Neutron Api Server -Wants=openvswitch-create-links-one-node.service -After=network-online.target openstack-neutron-setup.service openvswitch-create-links-one-node.service - -[Service] -Type=simple -User=neutron -ExecStart=/usr/bin/neutron-server \ - --config-file=/etc/neutron/neutron.conf \ - --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini \ - --log-file=/var/log/neutron/neutron-server.log - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-setup.service b/openstack/etc/systemd/system/openstack-neutron-setup.service deleted file mode 100644 index 4c09907e..00000000 --- a/openstack/etc/systemd/system/openstack-neutron-setup.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Run openstack-neutron-setup (once) -Wants=openvswitch-create-links-one-node.service -After=network-online.target openstack-keystone-setup.service openvswitch-create-links-one-node.service postgres-server.service - -[Service] -Type=oneshot -ExecStart=/usr/share/openstack/openstack-neutron-setup -Restart=no -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-api.service b/openstack/etc/systemd/system/openstack-nova-api.service deleted file mode 100644 index de7412ee..00000000 --- a/openstack/etc/systemd/system/openstack-nova-api.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Compute Service (code-named Nova) API server -After=syslog.target network.target - -[Service] -Type=simple -User=nova -ExecStart=/usr/bin/nova-api --config-file /etc/nova/nova.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-cert.service b/openstack/etc/systemd/system/openstack-nova-cert.service deleted file mode 100644 index c21246bf..00000000 --- a/openstack/etc/systemd/system/openstack-nova-cert.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Nova Cert -After=syslog.target network.target - -[Service] -Type=simple -User=nova -ExecStart=/usr/bin/nova-cert --config-file /etc/nova/nova.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-compute.service b/openstack/etc/systemd/system/openstack-nova-compute.service deleted file mode 100644 index dc18f225..00000000 --- a/openstack/etc/systemd/system/openstack-nova-compute.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenStack Compute Service (code-named Nova) API server -After=syslog.target network.target libvirtd.service -Requires=libvirtd.service - -[Service] -Type=simple -User=nova -ExecStart=/usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/nova-compute.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-conductor.service b/openstack/etc/systemd/system/openstack-nova-conductor.service deleted file mode 100644 index 68e0a6ed..00000000 --- a/openstack/etc/systemd/system/openstack-nova-conductor.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Database-access support for Compute nodes (nova-conductor) -After=syslog.target network.target libvirtd.service -Requires=libvirtd.service - -[Service] -Type=simple -User=nova -ExecStart=/usr/bin/nova-conductor --config-file /etc/nova/nova.conf --logfile /var/log/nova/conductor.log - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-consoleauth.service b/openstack/etc/systemd/system/openstack-nova-consoleauth.service deleted file mode 100644 index 2c582518..00000000 --- a/openstack/etc/systemd/system/openstack-nova-consoleauth.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Openstack Console Auth (nova-consoleauth) -After=syslog.target network.target - -[Service] -Type=simple -User=nova -ExecStart=/usr/bin/nova-consoleauth --config-file /etc/nova/nova.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-novncproxy.service b/openstack/etc/systemd/system/openstack-nova-novncproxy.service deleted file mode 100644 index 069e0751..00000000 --- a/openstack/etc/systemd/system/openstack-nova-novncproxy.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Nova NoVNC proxy -After=syslog.target network.target - -[Service] -Type=simple -User=nova -ExecStart=/usr/bin/nova-novncproxy --config-file /etc/nova/nova.conf --web /usr/share/novnc - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-scheduler.service b/openstack/etc/systemd/system/openstack-nova-scheduler.service deleted file mode 100644 index 519ef5eb..00000000 --- a/openstack/etc/systemd/system/openstack-nova-scheduler.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenStack Nova Scheduler -After=syslog.target network.target - -[Service] -Type=simple -User=nova -ExecStart=/usr/bin/nova-scheduler --config-file /etc/nova/nova.conf - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-setup.service b/openstack/etc/systemd/system/openstack-nova-setup.service deleted file mode 100644 index a4ad6ae7..00000000 --- a/openstack/etc/systemd/system/openstack-nova-setup.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run nova-setup Ansible scripts -After=local-fs.target libvirtd.service 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/nova.yml - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service deleted file mode 100644 index bacfc433..00000000 --- a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Create Veth pairs -Wants=openstack-neutron-network-configuration-one-node.service -After=network-online.target openstack-neutron-network-configuration-one-node.service - -[Service] -Type=oneshot -ExecStart=/usr/share/openstack/create_openvswitch_veth_pairs -RemainAfterExit=yes -Restart=no - -[Install] -WantedBy=multi-user.target - diff --git a/openstack/etc/systemd/system/openvswitch-db-server.service b/openstack/etc/systemd/system/openvswitch-db-server.service deleted file mode 100644 index e1cd2042..00000000 --- a/openstack/etc/systemd/system/openvswitch-db-server.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Open vSwitch Database Server Daemon -After=local-fs.target openvswitch-setup.service - -[Service] -Type=forking -ExecStart=/usr/sbin/ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock --remote=db:Open_vSwitch,Open_vSwitch,manager_options --private-key=db:Open_vSwitch,SSL,private_key --certificate=db:Open_vSwitch,SSL,certificate --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert --pidfile --detach - -[Install] -WantedBy=multi-user.target - diff --git a/openstack/etc/systemd/system/openvswitch-initialize-db.service b/openstack/etc/systemd/system/openvswitch-initialize-db.service deleted file mode 100644 index 3c564c5a..00000000 --- a/openstack/etc/systemd/system/openvswitch-initialize-db.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Run openvswitch-initialize-db (once) -After=local-fs.target openvswitch-db-server.service - -ConditionPathExists=!/usr/local/var/run/openvswitch/openvswitch-initialize-db-flag - -[Service] -Type=oneshot -ExecStart=/usr/bin/ovs-vsctl --no-wait init -ExecStart=/bin/touch /usr/local/var/run/openvswitch/openvswitch-initialize-db-flag diff --git a/openstack/etc/systemd/system/openvswitch-setup.service b/openstack/etc/systemd/system/openvswitch-setup.service deleted file mode 100644 index bfe67002..00000000 --- a/openstack/etc/systemd/system/openvswitch-setup.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Run openvswitch-setup (once) -After=local-fs.target - -[Service] -Type=oneshot -ExecStart=/usr/share/openstack/openvswitch-setup -Restart=no - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openvswitch.service b/openstack/etc/systemd/system/openvswitch.service deleted file mode 100644 index 446c0f95..00000000 --- a/openstack/etc/systemd/system/openvswitch.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Open vSwitch Daemon -After=openvswitch-initialize-db.service - -[Service] -Type=forking -ExecStart=/usr/sbin/ovs-vswitchd --pidfile --detach - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/postgres-server.service b/openstack/etc/systemd/system/postgres-server.service deleted file mode 100644 index 42e88042..00000000 --- a/openstack/etc/systemd/system/postgres-server.service +++ /dev/null @@ -1,24 +0,0 @@ -[Unit] -Description=PostgreSQL database server - -[Service] -Type=forking -TimeoutSec=120 -User=postgres -Group=postgres - -Environment=PGROOT=/var/lib/pgsql - -SyslogIdentifier=postgres -PIDFile=/var/lib/pgsql/data/postmaster.pid - -ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120 -ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload -ExecStop= /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast - -# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in -# killing Postgres, so adjust it downward -OOMScoreAdjust=-200 - -[Install] -WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/rabbitmq-server.service b/openstack/etc/systemd/system/rabbitmq-server.service deleted file mode 100644 index f0d60f51..00000000 --- a/openstack/etc/systemd/system/rabbitmq-server.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=RabbitMQ broker -After=syslog.target network.target - -[Service] -Type=notify -User=rabbitmq -Group=rabbitmq -Environment="HOME=/var/lib/rabbitmq" -WorkingDirectory=/var/lib/rabbitmq -ExecStart=/usr/sbin/rabbitmq-server -ExecStop=/usr/sbin/rabbitmqctl stop - -[Install] -WantedBy=multi-user.target diff --git a/openstack/manifest b/openstack/manifest index 8d4b6cf8..7eb9bcb5 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -54,8 +54,8 @@ 0100644 0 0 /usr/share/openstack/rabbitmq/rabbitmq-env.conf 0100644 0 0 /usr/share/openstack/rabbitmq/rabbitmq.config 0100644 0 0 /etc/logrotate.d/openstack-keystone -0100644 0 0 /etc/systemd/system/openstack-keystone.service -0100644 0 0 /etc/systemd/system/openstack-keystone-setup.service +0100644 0 0 /usr/lib/systemd/system/openstack-keystone.service +0100644 0 0 /usr/lib/systemd/system/openstack-keystone-setup.service 0040755 0 0 /etc/glance 0040755 0 0 /var/lib/glance 0040755 0 0 /var/lib/glance/image-cache @@ -65,25 +65,25 @@ 0040755 0 0 /var/lib/glance/images 0100644 0 0 /etc/logrotate.d/openstack-glance-api 0100644 0 0 /etc/logrotate.d/openstack-glance-registry -0100644 0 0 /etc/systemd/system/openstack-glance-setup.service -0100644 0 0 /etc/systemd/system/openstack-glance-api.service -0100644 0 0 /etc/systemd/system/openstack-glance-registry.service +0100644 0 0 /usr/lib/systemd/system/openstack-glance-setup.service +0100644 0 0 /usr/lib/systemd/system/openstack-glance-api.service +0100644 0 0 /usr/lib/systemd/system/openstack-glance-registry.service 0040755 0 0 /var/lib/nova -0100644 0 0 /etc/systemd/system/openstack-nova-setup.service -0100644 0 0 /etc/systemd/system/openstack-nova-compute.service -0100644 0 0 /etc/systemd/system/openstack-nova-conductor.service -0100644 0 0 /etc/systemd/system/openstack-nova-api.service -0100644 0 0 /etc/systemd/system/openstack-nova-scheduler.service -0100644 0 0 /etc/systemd/system/openstack-nova-consoleauth.service -0100644 0 0 /etc/systemd/system/openstack-nova-novncproxy.service -0100644 0 0 /etc/systemd/system/openstack-nova-cert.service -0100644 0 0 /etc/systemd/system/rabbitmq-server.service +0100644 0 0 /usr/lib/systemd/system/openstack-nova-setup.service +0100644 0 0 /usr/lib/systemd/system/openstack-nova-compute.service +0100644 0 0 /usr/lib/systemd/system/openstack-nova-conductor.service +0100644 0 0 /usr/lib/systemd/system/openstack-nova-api.service +0100644 0 0 /usr/lib/systemd/system/openstack-nova-scheduler.service +0100644 0 0 /usr/lib/systemd/system/openstack-nova-consoleauth.service +0100644 0 0 /usr/lib/systemd/system/openstack-nova-novncproxy.service +0100644 0 0 /usr/lib/systemd/system/openstack-nova-cert.service +0100644 0 0 /usr/lib/systemd/system/rabbitmq-server.service 0040755 0 0 /var/lib/cinder -0100644 0 0 /etc/systemd/system/openstack-cinder-setup.service -0100644 0 0 /etc/systemd/system/openstack-cinder-api.service -0100644 0 0 /etc/systemd/system/openstack-cinder-scheduler.service -0100644 0 0 /etc/systemd/system/openstack-cinder-volume.service -0100644 0 0 /etc/systemd/system/openstack-cinder-backup.service +0100644 0 0 /usr/lib/systemd/system/openstack-cinder-setup.service +0100644 0 0 /usr/lib/systemd/system/openstack-cinder-api.service +0100644 0 0 /usr/lib/systemd/system/openstack-cinder-scheduler.service +0100644 0 0 /usr/lib/systemd/system/openstack-cinder-volume.service +0100644 0 0 /usr/lib/systemd/system/openstack-cinder-backup.service 0040755 0 0 /etc/neutron 0100644 0 0 /usr/share/openstack/neutron/neutron.conf 0100644 0 0 /usr/share/openstack/neutron/api-paste.ini @@ -150,29 +150,29 @@ 0040755 0 0 /usr/share/openstack/neutron/plugins/vmware 0100644 0 0 /usr/share/openstack/neutron/plugins/vmware/nsx.ini 0100755 0 0 /usr/share/openstack/openstack-neutron-setup -0100644 0 0 /etc/systemd/system/openstack-neutron-setup.service -0100644 0 0 /etc/systemd/system/openstack-neutron-server.service -0100644 0 0 /etc/systemd/system/openstack-neutron-metadata-agent.service -0100644 0 0 /etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service -0100644 0 0 /etc/systemd/system/openstack-neutron-ovs-cleanup.service -0100644 0 0 /etc/systemd/system/openstack-neutron-dhcp-agent.service -0100644 0 0 /etc/systemd/system/openstack-neutron-l3-agent.service +0100644 0 0 /usr/lib/systemd/system/openstack-neutron-setup.service +0100644 0 0 /usr/lib/systemd/system/openstack-neutron-server.service +0100644 0 0 /usr/lib/systemd/system/openstack-neutron-metadata-agent.service +0100644 0 0 /usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service +0100644 0 0 /usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service +0100644 0 0 /usr/lib/systemd/system/openstack-neutron-dhcp-agent.service +0100644 0 0 /usr/lib/systemd/system/openstack-neutron-l3-agent.service 0100755 0 0 /usr/share/openstack/openvswitch-setup -0100644 0 0 /etc/systemd/system/openvswitch-setup.service -0100644 0 0 /etc/systemd/system/openvswitch-db-server.service -0100644 0 0 /etc/systemd/system/openvswitch.service +0100644 0 0 /usr/lib/systemd/system/openvswitch-setup.service +0100644 0 0 /usr/lib/systemd/system/openvswitch-db-server.service +0100644 0 0 /usr/lib/systemd/system/openvswitch.service 0100755 0 0 /usr/share/openstack/openstack-neutron-network-configuration-for-one-node -0100644 0 0 /etc/systemd/system/openstack-neutron-network-configuration-one-node.service -0100644 0 0 /etc/systemd/system/openvswitch-initialize-db.service -0100644 0 0 /etc/systemd/system/postgres-server.service -0100644 0 0 /etc/systemd/system/apache-httpd.service +0100644 0 0 /usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service +0100644 0 0 /usr/lib/systemd/system/openvswitch-initialize-db.service +0100644 0 0 /usr/lib/systemd/system/postgres-server.service +0100644 0 0 /usr/lib/systemd/system/apache-httpd.service 0040755 0 0 /etc/horizon 0040755 0 0 /etc/horizon/openstack_dashboard -0100644 0 0 /etc/systemd/system/openstack-horizon-setup.service +0100644 0 0 /usr/lib/systemd/system/openstack-horizon-setup.service 0100755 0 0 /usr/share/openstack/horizon.yml 0100644 0 0 /etc/horizon/apache-horizon.conf 0100644 0 0 /etc/horizon/openstack_dashboard/local_settings.py 0100644 0 0 /etc/sysctl.conf -0100644 0 0 /etc/systemd/system/openvswitch-create-links-one-node.service +0100644 0 0 /usr/lib/systemd/system/openvswitch-create-links-one-node.service 0100755 0 0 /usr/share/openstack/create_openvswitch_veth_pairs 0100644 0 0 /etc/hosts diff --git a/openstack/usr/lib/systemd/system/apache-httpd.service b/openstack/usr/lib/systemd/system/apache-httpd.service new file mode 100644 index 00000000..f1211ac9 --- /dev/null +++ b/openstack/usr/lib/systemd/system/apache-httpd.service @@ -0,0 +1,15 @@ +[Unit] +Description=Apache Web Server +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/var/run/httpd.pid +ExecStart=/usr/sbin/apachectl start +ExecStop=/usr/sbin/apachectl graceful-stop +ExecReload=/usr/sbin/apachectl graceful +PrivateTmp=true +LimitNOFILE=infinity + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-api.service b/openstack/usr/lib/systemd/system/openstack-cinder-api.service new file mode 100644 index 00000000..a4a100f8 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-cinder-api.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Volume Service (code-named Cinder) API server +After=syslog.target network.target + +[Service] +Type=simple +User=cinder +ExecStart=/usr/bin/cinder-api --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-backup.service b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service new file mode 100644 index 00000000..a8f09ae0 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-cinder-backup.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Cinder backup server +After=syslog.target network.target + +[Service] +Type=simple +User=cinder +ExecStart=/usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-backup.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service new file mode 100644 index 00000000..feff70f4 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-cinder-scheduler.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Cinder scheduler server +After=syslog.target network.target + +[Service] +Type=simple +User=cinder +ExecStart=/usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-setup.service b/openstack/usr/lib/systemd/system/openstack-cinder-setup.service new file mode 100644 index 00000000..b166674b --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-cinder-setup.service @@ -0,0 +1,9 @@ +[Unit] +Description=Run cinder-setup Ansile 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-cinder-volume.service b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service new file mode 100644 index 00000000..8852c90f --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-cinder-volume.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Cinder volume server +After=syslog.target network.target + +[Service] +Type=simple +User=cinder +ExecStart=/usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-glance-api.service b/openstack/usr/lib/systemd/system/openstack-glance-api.service new file mode 100644 index 00000000..7958f84c --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-glance-api.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenStack Image Service (code-named Glance) API server +After=syslog.target network.target + +[Service] +Type=simple +User=glance +ExecStart=/usr/bin/glance-api --config-file /etc/glance/glance-api.conf + +[Install] +WantedBy=multi-user.target + diff --git a/openstack/usr/lib/systemd/system/openstack-glance-registry.service b/openstack/usr/lib/systemd/system/openstack-glance-registry.service new file mode 100644 index 00000000..18a60ae1 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-glance-registry.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenStack Image Service (code-named Glance) Registry server +After=syslog.target network.target + +[Service] +Type=simple +User=glance +ExecStart=/usr/bin/glance-registry --config-file /etc/glance/glance-registry.conf + +[Install] +WantedBy=multi-user.target + diff --git a/openstack/usr/lib/systemd/system/openstack-glance-setup.service b/openstack/usr/lib/systemd/system/openstack-glance-setup.service new file mode 100644 index 00000000..c00c520c --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-glance-setup.service @@ -0,0 +1,9 @@ +[Unit] +Description=Run glance-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/glance.yml + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-horizon-setup.service b/openstack/usr/lib/systemd/system/openstack-horizon-setup.service new file mode 100644 index 00000000..9805a38f --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-horizon-setup.service @@ -0,0 +1,9 @@ +[Unit] +Description=Run horizon-setup Ansible scripts +After=local-fs.target + +[Service] +ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/horizon.yml + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-keystone-setup.service b/openstack/usr/lib/systemd/system/openstack-keystone-setup.service new file mode 100644 index 00000000..9ea04c1d --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-keystone-setup.service @@ -0,0 +1,12 @@ +[Unit] +Description=Run keystone-setup Ansible scripts +After=local-fs.target postgres-server.service +ConditionPathExists=/etc/openstack/keystone.conf + +[Service] +# Oneshot, since others setup have to wait until this service finishes +Type=oneshot +ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/keystone.yml + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-keystone.service b/openstack/usr/lib/systemd/system/openstack-keystone.service new file mode 100644 index 00000000..82b2d078 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-keystone.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenStack Identity Service (code-named Keystone) +After=syslog.target network.target + +[Service] +Type=notify +Restart=always +User=keystone +ExecStart=/usr/bin/keystone-all --config-file /etc/keystone/keystone.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service new file mode 100644 index 00000000..a86b7a0a --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-neutron-dhcp-agent.service @@ -0,0 +1,14 @@ +[Unit] +Description=Neutron DHCP Agent +After=network-online.target openstack-neutron-ovs-cleanup.service + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-dhcp-agent \ + --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/dhcp_agent.ini \ + --log-file=/var/log/neutron/dhcp-agent.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service new file mode 100644 index 00000000..7fe12f46 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-neutron-l3-agent.service @@ -0,0 +1,15 @@ +[Unit] +Description=Neutron Layer 3 Agent +After=network-online.target openstack-neutron-ovs-cleanup.service + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-l3-agent \ + --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/l3_agent.ini \ + --config-file=/etc/neutron/fwaas_driver.ini \ + --log-file=/var/log/neutron/l3-agent.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service new file mode 100644 index 00000000..15fd406f --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-neutron-metadata-agent.service @@ -0,0 +1,14 @@ +[Unit] +Description=Neutron Metadata Plugin Agent +After=network-online.target openstack-neutron-setup.service + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-metadata-agent \ + --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/metadata_agent.ini \ + --log-file=/var/log/neutron/metadata-agent.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service b/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service new file mode 100644 index 00000000..2b1d168b --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service @@ -0,0 +1,13 @@ +[Unit] +Description=Configuration script to set Openstack in one node networking +Wants=network-online.target +After=network-online.target openvswitch.service + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openstack-neutron-network-configuration-for-one-node +Restart=no +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service new file mode 100644 index 00000000..5eaf8a30 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-neutron-ovs-cleanup.service @@ -0,0 +1,14 @@ +[Unit] +Description=Neutron OVS cleanup +After=network-online.target openstack-neutron-setup.service +ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-ovs-cleanup \ + --log-file /var/log/neutron/ovs-cleanup.log \ + --config-file /etc/neutron/neutron.conf --verbose + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service b/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service new file mode 100644 index 00000000..12498cc9 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-neutron-plugin-openvswitch-agent.service @@ -0,0 +1,14 @@ +[Unit] +Description=Neutron OpenvSwitch Plugin Agent +After=network-online.target openstack-neutron-setup.service + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-openvswitch-agent \ + --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini \ + --log-file=/var/log/neutron/openvswitch-agent.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-server.service b/openstack/usr/lib/systemd/system/openstack-neutron-server.service new file mode 100644 index 00000000..b9484b94 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-neutron-server.service @@ -0,0 +1,15 @@ +[Unit] +Description=Neutron Api Server +Wants=openvswitch-create-links-one-node.service +After=network-online.target openstack-neutron-setup.service openvswitch-create-links-one-node.service + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-server \ + --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini \ + --log-file=/var/log/neutron/neutron-server.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service new file mode 100644 index 00000000..4c09907e --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service @@ -0,0 +1,13 @@ +[Unit] +Description=Run openstack-neutron-setup (once) +Wants=openvswitch-create-links-one-node.service +After=network-online.target openstack-keystone-setup.service openvswitch-create-links-one-node.service postgres-server.service + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openstack-neutron-setup +Restart=no +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-nova-api.service b/openstack/usr/lib/systemd/system/openstack-nova-api.service new file mode 100644 index 00000000..de7412ee --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-nova-api.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Compute Service (code-named Nova) API server +After=syslog.target network.target + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-api --config-file /etc/nova/nova.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-nova-cert.service b/openstack/usr/lib/systemd/system/openstack-nova-cert.service new file mode 100644 index 00000000..c21246bf --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-nova-cert.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Nova Cert +After=syslog.target network.target + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-cert --config-file /etc/nova/nova.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-nova-compute.service b/openstack/usr/lib/systemd/system/openstack-nova-compute.service new file mode 100644 index 00000000..dc18f225 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-nova-compute.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenStack Compute Service (code-named Nova) API server +After=syslog.target network.target libvirtd.service +Requires=libvirtd.service + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/nova-compute.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-nova-conductor.service b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service new file mode 100644 index 00000000..68e0a6ed --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-nova-conductor.service @@ -0,0 +1,12 @@ +[Unit] +Description=Database-access support for Compute nodes (nova-conductor) +After=syslog.target network.target libvirtd.service +Requires=libvirtd.service + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-conductor --config-file /etc/nova/nova.conf --logfile /var/log/nova/conductor.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service b/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service new file mode 100644 index 00000000..2c582518 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-nova-consoleauth.service @@ -0,0 +1,11 @@ +[Unit] +Description=Openstack Console Auth (nova-consoleauth) +After=syslog.target network.target + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-consoleauth --config-file /etc/nova/nova.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service b/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service new file mode 100644 index 00000000..069e0751 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-nova-novncproxy.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Nova NoVNC proxy +After=syslog.target network.target + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-novncproxy --config-file /etc/nova/nova.conf --web /usr/share/novnc + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service b/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service new file mode 100644 index 00000000..519ef5eb --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-nova-scheduler.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Nova Scheduler +After=syslog.target network.target + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-scheduler --config-file /etc/nova/nova.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-nova-setup.service b/openstack/usr/lib/systemd/system/openstack-nova-setup.service new file mode 100644 index 00000000..a4ad6ae7 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openstack-nova-setup.service @@ -0,0 +1,9 @@ +[Unit] +Description=Run nova-setup Ansible scripts +After=local-fs.target libvirtd.service 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/nova.yml + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openvswitch-create-links-one-node.service b/openstack/usr/lib/systemd/system/openvswitch-create-links-one-node.service new file mode 100644 index 00000000..bacfc433 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openvswitch-create-links-one-node.service @@ -0,0 +1,14 @@ +[Unit] +Description=Create Veth pairs +Wants=openstack-neutron-network-configuration-one-node.service +After=network-online.target openstack-neutron-network-configuration-one-node.service + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/create_openvswitch_veth_pairs +RemainAfterExit=yes +Restart=no + +[Install] +WantedBy=multi-user.target + diff --git a/openstack/usr/lib/systemd/system/openvswitch-db-server.service b/openstack/usr/lib/systemd/system/openvswitch-db-server.service new file mode 100644 index 00000000..e1cd2042 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openvswitch-db-server.service @@ -0,0 +1,11 @@ +[Unit] +Description=Open vSwitch Database Server Daemon +After=local-fs.target openvswitch-setup.service + +[Service] +Type=forking +ExecStart=/usr/sbin/ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock --remote=db:Open_vSwitch,Open_vSwitch,manager_options --private-key=db:Open_vSwitch,SSL,private_key --certificate=db:Open_vSwitch,SSL,certificate --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert --pidfile --detach + +[Install] +WantedBy=multi-user.target + diff --git a/openstack/usr/lib/systemd/system/openvswitch-initialize-db.service b/openstack/usr/lib/systemd/system/openvswitch-initialize-db.service new file mode 100644 index 00000000..3c564c5a --- /dev/null +++ b/openstack/usr/lib/systemd/system/openvswitch-initialize-db.service @@ -0,0 +1,10 @@ +[Unit] +Description=Run openvswitch-initialize-db (once) +After=local-fs.target openvswitch-db-server.service + +ConditionPathExists=!/usr/local/var/run/openvswitch/openvswitch-initialize-db-flag + +[Service] +Type=oneshot +ExecStart=/usr/bin/ovs-vsctl --no-wait init +ExecStart=/bin/touch /usr/local/var/run/openvswitch/openvswitch-initialize-db-flag diff --git a/openstack/usr/lib/systemd/system/openvswitch-setup.service b/openstack/usr/lib/systemd/system/openvswitch-setup.service new file mode 100644 index 00000000..bfe67002 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openvswitch-setup.service @@ -0,0 +1,11 @@ +[Unit] +Description=Run openvswitch-setup (once) +After=local-fs.target + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openvswitch-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openvswitch.service b/openstack/usr/lib/systemd/system/openvswitch.service new file mode 100644 index 00000000..446c0f95 --- /dev/null +++ b/openstack/usr/lib/systemd/system/openvswitch.service @@ -0,0 +1,10 @@ +[Unit] +Description=Open vSwitch Daemon +After=openvswitch-initialize-db.service + +[Service] +Type=forking +ExecStart=/usr/sbin/ovs-vswitchd --pidfile --detach + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/postgres-server.service b/openstack/usr/lib/systemd/system/postgres-server.service new file mode 100644 index 00000000..d824fc7b --- /dev/null +++ b/openstack/usr/lib/systemd/system/postgres-server.service @@ -0,0 +1,24 @@ +[Unit] +Description=PostgreSQL database server + +[Service] +Type=forking +TimeoutSec=120 +User=postgres +Group=postgres + +Environment=PGROOT=/var/lib/pgsql + +SyslogIdentifier=postgres +PIDFile=/var/lib/pgsql/data/postmaster.pid + +ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120 +ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload +ExecStop= /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast + +# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in +# killing Postgres, so adjust it downward +OOMScoreAdjust=-200 + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/rabbitmq-server.service b/openstack/usr/lib/systemd/system/rabbitmq-server.service new file mode 100644 index 00000000..f0d60f51 --- /dev/null +++ b/openstack/usr/lib/systemd/system/rabbitmq-server.service @@ -0,0 +1,15 @@ +[Unit] +Description=RabbitMQ broker +After=syslog.target network.target + +[Service] +Type=notify +User=rabbitmq +Group=rabbitmq +Environment="HOME=/var/lib/rabbitmq" +WorkingDirectory=/var/lib/rabbitmq +ExecStart=/usr/sbin/rabbitmq-server +ExecStop=/usr/sbin/rabbitmqctl stop + +[Install] +WantedBy=multi-user.target -- cgit v1.2.1