summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-29 18:38:38 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-29 18:38:38 (GMT)
commita8dead9867ea5e11c01027df7565577ccd78a5cb (patch)
tree196e9449a30cc83dcd224803eeef268e8e235163
parent4b6522b5aa4f3a4cbcecaa804303c0304011f74b (diff)
downloaddefinitions-a8dead9867ea5e11c01027df7565577ccd78a5cb.tar.gz
WIP: Reorganize services - It is not working
-rw-r--r--openstack-neutron.configure22
-rw-r--r--openstack/etc/systemd/system/apache-httpd-server-setup.service1
-rw-r--r--openstack/etc/systemd/system/openstack-cinder-setup.service3
-rw-r--r--openstack/etc/systemd/system/openstack-glance-setup.service3
-rw-r--r--openstack/etc/systemd/system/openstack-horizon-setup.service1
-rw-r--r--openstack/etc/systemd/system/openstack-keystone-setup.service1
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service3
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-l3-agent.service3
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-metadata-agent.service2
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service3
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service3
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service3
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-server.service3
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-setup.service3
-rw-r--r--openstack/etc/systemd/system/openstack-nova-setup.service3
-rw-r--r--openstack/etc/systemd/system/openvswitch-create-links-one-node.service2
-rw-r--r--openstack/etc/systemd/system/openvswitch-db-server.service5
-rw-r--r--openstack/etc/systemd/system/openvswitch-initialize-db.service7
-rw-r--r--openstack/etc/systemd/system/openvswitch-setup.service3
-rw-r--r--openstack/etc/systemd/system/openvswitch.service3
-rw-r--r--openstack/usr/share/openstack/postgres-setup2
-rw-r--r--openvswitch.configure10
22 files changed, 38 insertions, 51 deletions
diff --git a/openstack-neutron.configure b/openstack-neutron.configure
index f3c6aa8..f7dad9c 100644
--- a/openstack-neutron.configure
+++ b/openstack-neutron.configure
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright (C) 2014 Codethink Limited
+# Copyright (C) 2014-2015 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -43,15 +43,15 @@ sed -f "$ROOT"/etc/openstack-neutron-setup.sed -i \
##########################################################################
# Create the links to enable the neutron systemd services #
##########################################################################
-services=("openstack-neutron-network-configuration-one-node.service"
- "openvswitch-create-links-one-node.service"
- "openstack-neutron-dhcp-agent.service"
- "openstack-neutron-l3-agent.service"
- "openstack-neutron-metadata-agent.service"
- "openstack-neutron-network-configuration-one-node.service"
- "openstack-neutron-ovs-cleanup.service"
- "openstack-neutron-plugin-openvswitch-agent.service"
- "openstack-neutron-server.service"
+services=("openstack-neutron-network-configuration-one-node.service" \
+ "openvswitch-create-links-one-node.service" \
+ "openstack-neutron-dhcp-agent.service" \
+ "openstack-neutron-l3-agent.service" \
+ "openstack-neutron-metadata-agent.service" \
+ "openstack-neutron-network-configuration-one-node.service" \
+ "openstack-neutron-ovs-cleanup.service" \
+ "openstack-neutron-plugin-openvswitch-agent.service" \
+ "openstack-neutron-server.service" \
"openstack-neutron-setup.service")
for service in ${services[@]}; do
diff --git a/openstack/etc/systemd/system/apache-httpd-server-setup.service b/openstack/etc/systemd/system/apache-httpd-server-setup.service