Merge "Cleanup glance-registry"

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

ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2

@@ -43,7 +43,7 @@
   </rule>
   <rule>
     key     programname
-    pattern ^(glance-api|glance-registry)$
+    pattern ^(glance-api)$
     tag openstack_python
   </rule>
   <rule>

ansible/site.yml

@@ -648,7 +648,6 @@
   hosts:
     - ceph-mon
     - glance-api
-    - glance-registry
     - '&enable_glance_True'
   serial: '{{ kolla_serial|default("0") }}'
   roles: