Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update keystone to use train version #1317

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions install/opensds-authchecker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 <wanghui71leon@gmail.com>
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"]
6 changes: 4 additions & 2 deletions install/opensds-authchecker/keystone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}

Expand Down Expand Up @@ -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
}
Expand Down