From 91eb32326a0afde0c911f3568e83b587be13c7f8 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Mon, 10 Nov 2014 18:14:32 +0000 Subject: WIP: Actualize openstack/manifest adding nova and rabbitmq files --- openstack/manifest | 9 +++- .../share/openstack/openstack-nova-compute-setup | 56 ---------------------- 2 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 openstack/usr/share/openstack/openstack-nova-compute-setup diff --git a/openstack/manifest b/openstack/manifest index 002b74d2..aa01dd5e 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -33,11 +33,11 @@ 0100644 0 0 /etc/systemd/system/openstack-glance-registry.service 0100755 0 0 /usr/share/openstack/openstack-glance-setup 0040755 0 0 /var/lib/nova -0040755 0 0 /var/lock/nova 0040755 0 0 /etc/nova 0100644 0 0 /etc/nova/logging.conf 0100644 0 0 /etc/nova/rootwrap.conf 0100644 0 0 /etc/nova/nova.conf +0100644 0 0 /etc/nova/nova-compute.conf 0100644 0 0 /etc/nova/policy.json 0100644 0 0 /etc/nova/cells.json 0100644 0 0 /etc/nova/api-paste.ini @@ -48,5 +48,10 @@ 0100644 0 0 /etc/nova/rootwrap.d/compute.filters 0100644 0 0 /etc/nova/rootwrap.d/network.filters 0100755 0 0 /usr/share/openstack/openstack-nova-setup -0100644 0 0 /usr/share/openstack/openstack-nova-compute-setup 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-api.service +0100644 0 0 /etc/systemd/system/openstack-rabbitmq-setup.service +0100644 0 0 /etc/systemd/system/openstack-rabbitmq-server.service +0100755 0 0 /usr/share/openstack/openstack-rabbitmq-setup +0040755 0 0 /var/lib/rabbitmq diff --git a/openstack/usr/share/openstack/openstack-nova-compute-setup b/openstack/usr/share/openstack/openstack-nova-compute-setup deleted file mode 100644 index 9dc204d4..00000000 --- a/openstack/usr/share/openstack/openstack-nova-compute-setup +++ /dev/null @@ -1,56 +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 - -# Create required system users and groups - -getent group keystone >/dev/null || groupadd -r --gid 163 keystone -getent passwd keystone >/dev/null || \ - useradd --uid 163 -r -g keystone -d /var/lib/keystone -s /sbin/nologin \ - -c "OpenStack Keystone Daemons" keystone - -# Setup the keystone database - -if [ ! -e /var/lib/keystone/keystone.sqlite ]; then - chown keystone:keystone /var/lib/keystone - sudo -u keystone keystone-manage db_sync -fi - -systemctl start openstack-keystone - -export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN## -export OS_SERVICE_ENDPOINT='http://localhost:35357/v2.0' - -# This script creates a TEMPORARY admin user, with a password that may -# float arount on the system. Please delete this user once you have set up -# the real admin user with a real secure password. - -keystone tenant-create --name admin --description "Admin Tenant" -keystone role-create --name admin - -keystone user-create --name temporary_admin --pass ##KEYSTONE_TEMPORARY_ADMIN_PASSWORD## -keystone user-role-add --tenant admin --user temporary_admin --role admin - -keystone tenant-create --name service --description "Service Tenant" - -rm /etc/systemd/system/multi-user.target.wants/openstack-keystone-setup.service - -ln -s "/etc/systemd/system/openstack-keystone.service" \ - "/etc/systemd/system/multi-user.target.wants/openstack-keystone.service" - -exit 0 -- cgit v1.2.1