summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-26 18:39:02 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-08 15:46:36 +0000
commitb40d66ea1e0411c71ece3cf4b70d725c725f848d (patch)
tree223fe3d5765cec5cb3730d083eb06d630d61036c
parent22bca4030daaff1c68031ce4a113491f4300130f (diff)
downloaddefinitions-b40d66ea1e0411c71ece3cf4b70d725c725f848d.tar.gz
keystone: Remove obsolete setup-scripts/configure-extensions
-rw-r--r--openstack-rabbitmq.configure47
-rw-r--r--openstack/etc/systemd/system/openstack-rabbitmq-setup.service12
-rw-r--r--openstack/etc/systemd/system/postgres-server.service2
-rw-r--r--openstack/etc/systemd/system/postgres-setup.service11
-rw-r--r--postgres.configure23
-rw-r--r--systems/openstack-server.morph1
6 files changed, 0 insertions, 96 deletions
diff --git a/openstack-rabbitmq.configure b/openstack-rabbitmq.configure
deleted file mode 100644
index 40c37698..00000000
--- a/openstack-rabbitmq.configure
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2014 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
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-set -e
-
-ROOT="$1"
-
-##########################################################################
-# Substitutions in configuration files
-##########################################################################
-
-cat <<EOF > "$ROOT"/etc/openstack-rabbitmq-setup.sed
-s/##RABBITMQ_HOST##/$RABBITMQ_HOST/g
-s/##RABBITMQ_PORT##/$RABBITMQ_PORT/g
-s/##RABBITMQ_USER##/$RABBITMQ_USER/g
-s/##RABBITMQ_PASSWORD##/$RABBITMQ_PASSWORD/g
-EOF
-
-sed -f "$ROOT"/etc/openstack-rabbitmq-setup.sed -i \
- "$ROOT"/etc/keystone/keystone.conf \
- "$ROOT"/etc/nova/nova.conf \
- "$ROOT"/etc/cinder/cinder.conf \
- "$ROOT"/etc/neutron/neutron.conf \
- "$ROOT"/etc/glance/glance-api.conf \
- "$ROOT"/usr/share/openstack/openstack-rabbitmq-setup
-
-##########################################################################
-
-ln -s "/etc/systemd/system/openstack-rabbitmq-setup.service" \
- "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-rabbitmq-setup.service"
-
-ln -s "/etc/systemd/system/openstack-rabbitmq-server.service" \
- "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-rabbitmq-server.service"
diff --git a/openstack/etc/systemd/system/openstack-rabbitmq-setup.service b/openstack/etc/systemd/system/openstack-rabbitmq-setup.service
deleted file mode 100644
index 85257fd1..00000000
--- a/openstack/etc/systemd/system/openstack-rabbitmq-setup.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Run openstack-rabbitmq-setup (once)
-Requires=local-fs.target
-After=local-fs.target network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/openstack-rabbitmq-setup
-Restart=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/etc/systemd/system/postgres-server.service b/openstack/etc/systemd/system/postgres-server.service
index 6ee25e98..42e88042 100644
--- a/openstack/etc/systemd/system/postgres-server.service
+++ b/openstack/etc/systemd/system/postgres-server.service
@@ -1,7 +1,5 @@
[Unit]
Description=PostgreSQL database server
-Requires=postgres-setup.service
-After=postgres-setup.service
[Service]
Type=forking
diff --git a/openstack/etc/systemd/system/postgres-setup.service b/openstack/etc/systemd/system/postgres-setup.service
deleted file mode 100644
index 281d0d77..00000000
--- a/openstack/etc/systemd/system/postgres-setup.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Run postgres-setup (once)
-After=network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/postgres-setup
-Restart=no
-
-[Install]
-WantedBy=multi-user.target
diff --git a/postgres.configure b/postgres.configure
deleted file mode 100644
index 257cf56c..00000000
--- a/postgres.configure
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2014 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
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-set -e
-
-ROOT="$1"
-
-ln -sf "/etc/systemd/system/postgres-server.service" \
- "$ROOT/etc/systemd/system/multi-user.target.wants/postgres-server.service"
diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph
index 69e992a7..61c0e8fc 100644
--- a/systems/openstack-server.morph
+++ b/systems/openstack-server.morph
@@ -69,5 +69,4 @@ configuration-extensions:
- openstack-cinder
- openstack-neutron
- openvswitch
-- postgres
- apache-httpd-server