From 25ecc192964082f2fad2a4d7a0fcb7e3f9187212 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 5 Jan 2017 17:10:28 -0500 Subject: [PATCH] Remove Glance Registry from undercloud Remove Glance Registry from undercloud. Note: documentation mentions that we stop services before upgrade, so we don't need to manage that in the Puppet manifest. Change-Id: I54bf3b21695038c25855e29805629193e1f51d4e --- .../puppet-stack-config/puppet-stack-config.pp | 1 - .../puppet-stack-config.yaml.template | 16 ++-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index 3be05fd4f..46f7e3931 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -313,7 +313,6 @@ if str2bool(hiera('member_role_exists', false)) { class { '::glance::api': enable_proxy_headers_parsing => $enable_proxy_headers_parsing, } -include ::glance::registry include ::glance::backend::swift include ::glance::notify::rabbitmq diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 0abab2ab6..95f9fc0fd 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -109,20 +109,8 @@ glance::api::pipeline: 'keystone' # used to construct glance_api_servers glance_log_file: '' glance::api::database_connection: mysql+pymysql://glance:{{UNDERCLOUD_GLANCE_PASSWORD}}@{{LOCAL_IP}}/glance -glance::registry::debug: "%{hiera('debug')}" -glance::registry::bind_host: {{LOCAL_IP}} -glance::registry::authtoken::password: {{UNDERCLOUD_GLANCE_PASSWORD}} -glance::registry::database_connection: mysql+pymysql://glance:{{UNDERCLOUD_GLANCE_PASSWORD}}@{{LOCAL_IP}}/glance -glance::registry::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}" -glance::registry::authtoken::auth_url: "%{hiera('keystone_identity_uri')}" -glance::registry::registry_host: {{LOCAL_IP}} -glance::registry::bind_host: {{LOCAL_IP}} -glance::registry::manage_service: true -glance::registry::pipeline: 'keystone' -glance::registry::workers: "%{::os_workers}" -glance::registry::auth_host: false -glance::registry::auth_port: false -glance::registry::auth_protocol: false +glance::api::enable_v1_api: false +glance::api::enable_v2_api: true glance::keystone::auth::tenant: 'service' glance::keystone::auth::public_url: {{UNDERCLOUD_ENDPOINT_GLANCE_PUBLIC}} glance::keystone::auth::internal_url: {{UNDERCLOUD_ENDPOINT_GLANCE_INTERNAL}}