From 9c828dba4b22fb032c0da8dcd146914b38cb4b44 Mon Sep 17 00:00:00 2001 From: Ryan Brady Date: Mon, 20 Oct 2014 14:25:01 -0400 Subject: [PATCH] Migrates glance element from map-services to svc-map This patch migrates the glance element from map-services to svc-map by adding a svc-map file and adding the -a option to os-svc-enable. Change-Id: I5e5b57d18a8e0923f95296e036c818c44323a017 --- elements/glance/install.d/glance-source-install/75-glance | 4 ++-- .../glance/os-refresh-config/post-configure.d/75-glance | 8 ++++---- elements/glance/svc-map | 7 +++++++ 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 elements/glance/svc-map diff --git a/elements/glance/install.d/glance-source-install/75-glance b/elements/glance/install.d/glance-source-install/75-glance index 463d002e2..1e3caba9b 100755 --- a/elements/glance/install.d/glance-source-install/75-glance +++ b/elements/glance/install.d/glance-source-install/75-glance @@ -12,7 +12,7 @@ cp /opt/stack/glance/etc/schema-image.json /etc/glance/schema-image.json cp /opt/stack/glance/etc/glance-api-paste.ini /etc/glance/glance-api-paste.ini cp /opt/stack/glance/etc/glance-registry-paste.ini /etc/glance/glance-registry-paste.ini -os-svc-daemon -i "$GLANCE_VENV_DIR" glance-api glance glance-api -os-svc-daemon -i "$GLANCE_VENV_DIR" glance-reg glance glance-registry +os-svc-daemon -a -i "$GLANCE_VENV_DIR" glance-api glance glance-api +os-svc-daemon -a -i "$GLANCE_VENV_DIR" glance-reg glance glance-registry add-selinux-path-substitution /usr/bin $GLANCE_VENV_DIR/bin diff --git a/elements/glance/os-refresh-config/post-configure.d/75-glance b/elements/glance/os-refresh-config/post-configure.d/75-glance index 55ff46507..81fcb6cc4 100755 --- a/elements/glance/os-refresh-config/post-configure.d/75-glance +++ b/elements/glance/os-refresh-config/post-configure.d/75-glance @@ -1,8 +1,8 @@ #!/bin/bash set -eu -os-svc-enable -n glance-api -os-svc-enable -n glance-reg +os-svc-enable -an glance-api +os-svc-enable -an glance-reg -os-svc-restart -n glance-api -os-svc-restart -n glance-reg +os-svc-restart -an glance-api +os-svc-restart -an glance-reg diff --git a/elements/glance/svc-map b/elements/glance/svc-map new file mode 100644 index 000000000..a5baccd1a --- /dev/null +++ b/elements/glance/svc-map @@ -0,0 +1,7 @@ +glance-api: + default: openstack-glance-api + debian: glance-api +glance-reg: + default: openstack-glance-registry + debian: glance-reg +