Changing openstackclient commands

Change-Id: I9a1bae3ea9781a2626f02fe7c0c1960170fd4ba4
Depends-On: I828047a4dae3452e4817eb8963474522883ae088
This commit is contained in:
Andrey 2016-07-22 19:02:02 +00:00
parent 0c7492eb88
commit d93901ce57
3 changed files with 27 additions and 29 deletions

View File

@ -1,9 +1,6 @@
FROM {{ namespace }}/glance-base:{{ tag }}
MAINTAINER {{ maintainer }}
COPY glance-service-registry.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/glance-service-registry.sh
#mysql-client only for provisioning need to be removed later
RUN apt-get install -y --no-install-recommends \
mysql-client \

View File

@ -1,22 +0,0 @@
#!/bin/bash -ex
KEYSTONE_ADDRESS=${1}
KEYSTONE_ADMIN_PORT=${2}
export OS_USERNAME=${3}
export OS_PASSWORD=${4}
export OS_PROJECT_NAME=${5}
export OS_DOMAIN_NAME=${6}
GLANCE_USER=${7}
GLANCE_PASSWORD=${8}
export OS_AUTH_URL=http://${KEYSTONE_ADDRESS}:${KEYSTONE_ADMIN_PORT}/v3
export OS_IDENTITY_API_VERSION=3
openstack user create --domain default --password ${GLANCE_PASSWORD} ${GLANCE_USER}
openstack role add --project ${OS_PROJECT_NAME} --user ${GLANCE_USER} admin
openstack service create --name glance --description "OpenStack Image service" image
openstack endpoint create --region RegionOne image public http://glance-api:9292
openstack endpoint create --region RegionOne image internal http://glance-api:9292
openstack endpoint create --region RegionOne image admin http://glance-api:9292

View File

@ -26,13 +26,36 @@ service:
- glance-db-create
type: single
command: glance-manage db_sync
- name: glance-service-registry
- name: glance-user-create
dependencies:
- keystone
type: single
command:
glance-service-registry.sh keystone {{ keystone_admin_port }} {{ openstack_user_name }} {{ openstack_user_password }}
{{ openstack_project_name }} default {{ glance_user }} {{ glance_password }}
command: openstack user create --domain default --password {{ glance_password }} {{ glance_user }}
- name: glance-role-add
dependencies:
- glance-user-create
type: single
command: openstack role add --project {{ openstack_project_name }} --user {{ glance_user }} admin
- name: glance-service-create
dependencies:
- keystone
type: single
command: openstack service create --name glance --description "OpenStack Image service" image
- name: glance-public-endpoint-create
dependencies:
- glance-service-create
type: single
command: openstack endpoint create --region RegionOne image public http://glance-api:{{ glance_api_port }}
- name: glance-internal-endpoint-create
dependencies:
- glance-service-create
type: single
command: openstack endpoint create --region RegionOne image internal http://glance-api:{{ glance_api_port }}
- name: glance-admin-endpoint-create
dependencies:
- glance-service-create
type: single
command: openstack endpoint create --region RegionOne image admin http://glance-api:{{ glance_api_port }}
daemon:
name: glance-api
files: