diff options
-rw-r--r-- | openstack-glance.configure | 26 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance.yml | 10 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance/glance-api.conf | 6 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance/glance-registry.conf | 6 |
4 files changed, 14 insertions, 34 deletions
diff --git a/openstack-glance.configure b/openstack-glance.configure index 128df556..7051f156 100644 --- a/openstack-glance.configure +++ b/openstack-glance.configure @@ -31,20 +31,13 @@ ln -s "/etc/systemd/system/openstack-glance-setup.service" \ if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -a \ -z "$GLANCE_SERVICE_USER" -a \ -z "$GLANCE_SERVICE_PASSWORD" -a \ - -z "$GLANCE_PUBLIC_URL" -a \ - -z "$GLANCE_INTERNAL_URL" -a \ - -z "$GLANCE_ADMIN_URL" -a \ - -z "$KEYSTONE_PUBLIC_URL" -a \ - -z "$KEYSTONE_INTERNAL_URL" -a \ - -z "$KEYSTONE_ADMIN_URL" -a \ - -z "$IDENTITY_URI" -a \ -z "$GLANCE_DB_USER" -a \ -z "$GLANCE_DB_PASSWORD" -a \ -z "$RABBITMQ_HOST" -a \ -z "$RABBITMQ_PORT" -a \ -z "$RABBITMQ_USER" -a \ -z "$RABBITMQ_PASSWORD" -a \ - -z "$CONTROLLER_HOST" ]; then + -z "$CONTROLLER_HOST_ADDRESS" ]; then # No Glance options defined, do nothing. exit 0 fi @@ -52,20 +45,13 @@ fi if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -o \ -z "$GLANCE_SERVICE_USER" -o \ -z "$GLANCE_SERVICE_PASSWORD" -o \ - -z "$GLANCE_PUBLIC_URL" -o \ - -z "$GLANCE_INTERNAL_URL" -o \ - -z "$GLANCE_ADMIN_URL" -o \ - -z "$KEYSTONE_PUBLIC_URL" -o \ - -z "$KEYSTONE_INTERNAL_URL" -o \ - -z "$KEYSTONE_ADMIN_URL" -o \ - -z "$IDENTITY_URI" -o \ -z "$GLANCE_DB_USER" -o \ -z "$GLANCE_DB_PASSWORD" -o \ -z "$RABBITMQ_HOST" -o \ -z "$RABBITMQ_PORT" -o \ -z "$RABBITMQ_USER" -o \ -z "$RABBITMQ_PASSWORD" -o \ - -z "$CONTROLLER_HOST" ]; then + -z "$CONTROLLER_HOST_ADDRESS" ]; then echo Some options required for Glance were defined, but not all. exit 1 fi @@ -82,17 +68,11 @@ import os, sys, yaml glance_configuration={ 'KEYSTONE_TEMPORARY_ADMIN_TOKEN': os.environ['KEYSTONE_TEMPORARY_ADMIN_TOKEN'], - 'KEYSTONE_PUBLIC_URL': os.environ['KEYSTONE_PUBLIC_URL'], - 'KEYSTONE_ADMIN_URL': os.environ['KEYSTONE_ADMIN_URL'], - 'IDENTITY_URI': os.environ['IDENTITY_URI'], - 'GLANCE_ADMIN_URL': os.environ['GLANCE_ADMIN_URL'], - 'GLANCE_INTERNAL_URL': os.environ['GLANCE_INTERNAL_URL'], - 'GLANCE_PUBLIC_URL': os.environ['GLANCE_PUBLIC_URL'], 'GLANCE_SERVICE_PASSWORD': os.environ['GLANCE_SERVICE_PASSWORD'], 'GLANCE_SERVICE_USER': os.environ['GLANCE_SERVICE_USER'], 'GLANCE_DB_USER': os.environ['GLANCE_DB_USER'], 'GLANCE_DB_PASSWORD': os.environ['GLANCE_DB_PASSWORD'], - 'CONTROLLER_HOST': os.environ['CONTROLLER_HOST'], + 'CONTROLLER_HOST_ADDRESS': os.environ['CONTROLLER_HOST_ADDRESS'], 'RABBITMQ_HOST': os.environ['RABBITMQ_HOST'], 'RABBITMQ_PORT': os.environ['RABBITMQ_PORT'], 'RABBITMQ_USER': os.environ['RABBITMQ_USER'], diff --git a/openstack/usr/share/openstack/glance.yml b/openstack/usr/share/openstack/glance.yml index 83d73428..618af958 100644 --- a/openstack/usr/share/openstack/glance.yml +++ b/openstack/usr/share/openstack/glance.yml @@ -38,16 +38,16 @@ name=glance type=image description="Openstack Image Service" - publicurl={{ GLANCE_PUBLIC_URL }} - internalurl={{ GLANCE_INTERNAL_URL }} - adminurl={{ GLANCE_ADMIN_URL }} + publicurl=http://{{ CONTROLLER_HOST_ADDRESS }}:9292 + internalurl=http://{{ CONTROLLER_HOST_ADDRESS }}:9292 + adminurl=http://{{ CONTROLLER_HOST_ADDRESS }}:9292 region='RegionOne' token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} - - postgresql_user: name={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST }} password={{ GLANCE_DB_PASSWORD }} + - postgresql_user: name={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }} password={{ GLANCE_DB_PASSWORD }} sudo: yes sudo_user: glance - - postgresql_db: name=glance owner={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST }} + - postgresql_db: name=glance owner={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }} sudo: yes sudo_user: glance diff --git a/openstack/usr/share/openstack/glance/glance-api.conf b/openstack/usr/share/openstack/glance/glance-api.conf index 197dca8c..038ab877 100644 --- a/openstack/usr/share/openstack/glance/glance-api.conf +++ b/openstack/usr/share/openstack/glance/glance-api.conf @@ -586,7 +586,7 @@ image_cache_dir = /var/lib/glance/image-cache/ # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection = <None> -connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROLLER_HOST }}/glance +connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/glance # The SQL mode to be used for MySQL sessions. This option, # including the default, overrides any server-set SQL mode. To @@ -667,8 +667,8 @@ connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROL #db_max_retries = 20 [keystone_authtoken] -auth_uri = {{ KEYSTONE_PUBLIC_URL }} -identity_uri = {{ IDENTITY_URI }} +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 admin_tenant_name = service admin_user = {{ GLANCE_SERVICE_USER }} admin_password = {{ GLANCE_SERVICE_PASSWORD }} diff --git a/openstack/usr/share/openstack/glance/glance-registry.conf b/openstack/usr/share/openstack/glance/glance-registry.conf index 6679c278..a759385d 100644 --- a/openstack/usr/share/openstack/glance/glance-registry.conf +++ b/openstack/usr/share/openstack/glance/glance-registry.conf @@ -99,7 +99,7 @@ limit_param_default = 25 # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection = <None> -connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROLLER_HOST}}/glance +connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/glance # The SQL mode to be used for MySQL sessions. This option, # including the default, overrides any server-set SQL mode. To @@ -180,8 +180,8 @@ connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROL #db_max_retries = 20 [keystone_authtoken] -auth_uri = {{ KEYSTONE_PUBLIC_URL }} -identity_uri = {{ IDENTITY_URI }} +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 admin_tenant_name = service admin_user = {{ GLANCE_SERVICE_USER }} admin_password = {{ GLANCE_SERVICE_PASSWORD }} |