From e4e4a69df4c5acc3b1a66915fa7fbce3fc9b5e5f Mon Sep 17 00:00:00 2001 From: "zhang.lei" Date: Fri, 4 Jan 2019 06:23:33 +0000 Subject: [PATCH] Cleanup glance-registry This patch is a completion for https://review.openstack.org/#/c/565248/ Change-Id: I74d2eb99bf9bfaccadbb04239f97ce86b9d70840 Closes-Bug: #1769837 --- .../roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2 | 2 +- .../roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2 | 2 +- ansible/site.yml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2 b/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2 index 5bf39693fa..4ae7846724 100644 --- a/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2 +++ b/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2 @@ -9,7 +9,7 @@ rewriterule6 programname ^(magnum-conductor|magnum-api)$ openstack_python rewriterule7 programname ^(keystone)$ openstack_python rewriterule8 programname ^(heat-engine|heat-api|heat-api-cfn)$ openstack_python - rewriterule9 programname ^(glance-api|glance-registry)$ openstack_python + rewriterule9 programname ^(glance-api)$ openstack_python rewriterule10 programname ^(cloudkitty-storage-init|cloudkitty-processor|cloudkitty-dbsync|cloudkitty-api)$ openstack_python rewriterule11 programname ^(ceilometer-polling|ceilometer-agent-notification)$ openstack_python rewriterule12 programname ^(barbican-worker|barbican-keystone-listener|barbican-db-manage|app)$ openstack_python diff --git a/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2 b/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2 index a2c7578338..4f33a38243 100644 --- a/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2 +++ b/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2 @@ -43,7 +43,7 @@ key programname - pattern ^(glance-api|glance-registry)$ + pattern ^(glance-api)$ tag openstack_python diff --git a/ansible/site.yml b/ansible/site.yml index 3cc9b0b886..ccb328f80e 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -634,7 +634,6 @@ hosts: - ceph-mon - glance-api - - glance-registry - '&enable_glance_True' serial: '{{ kolla_serial|default("0") }}' roles: