From 26b9b85bef066ef587206d365c0532082b9a3f3d Mon Sep 17 00:00:00 2001 From: Rajat Ranjan Verma Date: Thu, 27 May 2021 23:37:00 +0530 Subject: [PATCH] update keystone to use train version --- install/opensds-authchecker/Dockerfile | 5 ++--- install/opensds-authchecker/keystone.sh | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/install/opensds-authchecker/Dockerfile b/install/opensds-authchecker/Dockerfile index 84a7f5065..1bc406853 100644 --- a/install/opensds-authchecker/Dockerfile +++ b/install/opensds-authchecker/Dockerfile @@ -7,15 +7,14 @@ # Docker run usage: # docker run -d --privileged=true --name opensds-authchecker opensdsio/opensds-authchecker:latest -FROM ubuntu:16.04 -MAINTAINER Leon Wang +FROM ubuntu:18.04 COPY keystone.sh /keystone.sh COPY entrypoint.sh /entrypoint.sh # Install some packages before running command. RUN apt-get update && apt-get install -y \ - sudo nano git telnet net-tools iptables gnutls-bin ca-certificates && \ + sudo nano git init telnet net-tools iptables gnutls-bin ca-certificates && \ mkdir -p /opt/stack/ RUN ["chmod", "+x", "/keystone.sh", "/entrypoint.sh"] diff --git a/install/opensds-authchecker/keystone.sh b/install/opensds-authchecker/keystone.sh index dd435011a..3de19ed8e 100644 --- a/install/opensds-authchecker/keystone.sh +++ b/install/opensds-authchecker/keystone.sh @@ -26,7 +26,7 @@ STACK_GIT_BASE=${STACK_GIT_BASE:-https://git.openstack.org} STACK_USER_NAME=${STACK_USER_NAME:-stack} STACK_PASSWORD=${STACK_PASSWORD:-opensds@123} STACK_HOME=${STACK_HOME:-/opt/stack} -STACK_BRANCH=${STACK_BRANCH:-stable/queens} +STACK_BRANCH=${STACK_BRANCH:-stable/train} DEV_STACK_DIR=$STACK_HOME/devstack # Multi-Cloud service name in keystone @@ -39,6 +39,8 @@ osds::keystone::create_user(){ return fi sudo useradd -s /bin/bash -d ${STACK_HOME} -m ${STACK_USER_NAME} + # To Grant permission to STACK_USER to access STACK_HOME + sudo chown -R ${STACK_USER_NAME}:${STACK_USER_NAME} ${STACK_HOME} echo "stack ALL=(ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/stack } @@ -121,7 +123,7 @@ osds::keystone::install(){ osds::keystone::devstack_local_conf cd ${DEV_STACK_DIR} - su $STACK_USER_NAME -c ${DEV_STACK_DIR}/stack.sh + su $STACK_USER_NAME -c FORCE=yes ${DEV_STACK_DIR}/stack.sh osds::keystone::create_user_and_endpoint osds::keystone::delete_redundancy_data }