Making glance service names consistent

Right now for most cookbooks we declare resources with the name of the
service itself. So, for example, in the 'identity' cookbook, the
'keystone' service is called 'keystone'. The other cookboks follow this
same standard.

Why is this important? Things like omnibus-openstack depend on these
cookbooks having a common standard. That, and well, standards make us
all happy.

Change-Id: I3b1cb845cfb21b5e1d46feca322f3c2788431a27

README.md

@@ -23,11 +23,11 @@ Usage
 
 api
 ------
-- Installs the image-api server
+- Installs the glance-api server
 
 registry
 --------
-- Installs the image-registry server
+- Installs the glance-registry server
 
 keystone-registration
 ---------------------

recipes/api.rb

@@ -56,7 +56,7 @@ if node['openstack']['image']['api']['default_store'] == 'swift'
   end
 end
 
-service 'image-api' do
+service 'glance-api' do
   service_name platform_options['image_api_service']
   supports status: true, restart: true
 
@@ -81,7 +81,7 @@ template '/etc/glance/policy.json' do
   group node['openstack']['image']['group']
   mode   00644
 
-  notifies :restart, 'service[image-api]', :immediately
+  notifies :restart, 'service[glance-api]', :immediately
 end
 
 glance = node['openstack']['image']
@@ -169,7 +169,7 @@ template '/etc/glance/glance-api.conf' do
     swift_store_auth_version: swift_store_auth_version
   )
 
-  notifies :restart, 'service[image-api]', :immediately
+  notifies :restart, 'service[glance-api]', :immediately
 end
 
 template '/etc/glance/glance-api-paste.ini' do
@@ -178,7 +178,7 @@ template '/etc/glance/glance-api-paste.ini' do
   group node['openstack']['image']['group']
   mode   00644
 
-  notifies :restart, 'service[image-api]', :immediately
+  notifies :restart, 'service[glance-api]', :immediately
 end
 
 template '/etc/glance/glance-cache.conf' do
@@ -191,7 +191,7 @@ template '/etc/glance/glance-cache.conf' do
     registry_port: registry_endpoint.port
   )
 
-  notifies :restart, 'service[image-api]', :immediately
+  notifies :restart, 'service[glance-api]', :immediately
 end
 
 # TODO(jaypipes) I don't think this even exists or at least isn't
@@ -202,7 +202,7 @@ template '/etc/glance/glance-cache-paste.ini' do
   group node['openstack']['image']['group']
   mode   00644
 
-  notifies :restart, 'service[image-api]', :immediately
+  notifies :restart, 'service[glance-api]', :immediately
 end
 
 template '/etc/glance/glance-scrubber.conf' do

recipes/registry.rb

@@ -67,7 +67,7 @@ directory ::File.dirname(node['openstack']['image']['registry']['auth']['cache_d
   mode 00700
 end
 
-service 'image-registry' do
+service 'glance-registry' do
   service_name platform_options['image_registry_service']
   supports status: true, restart: true
 
@@ -112,7 +112,7 @@ template '/etc/glance/glance-registry.conf' do
     'service_pass' => service_pass
   )
 
-  notifies :restart, 'service[image-registry]', :immediately
+  notifies :restart, 'service[glance-registry]', :immediately
 end
 
 execute 'glance-manage db_sync' do
@@ -125,5 +125,5 @@ template '/etc/glance/glance-registry-paste.ini' do
   group  'root'
   mode   00644
 
-  notifies :restart, 'service[image-registry]', :immediately
+  notifies :restart, 'service[glance-registry]', :immediately
 end

spec/api_spec.rb

@@ -43,8 +43,8 @@ describe 'openstack-image::api' do
         expect(sprintf('%o', file.mode)).to eq '644'
       end
 
-      it 'notifies image-api restart' do
+      it 'notifies glance-api restart' do
-        expect(file).to notify('service[image-api]').to(:restart)
+        expect(file).to notify('service[glance-api]').to(:restart)
       end
     end
 
@@ -84,8 +84,8 @@ describe 'openstack-image::api' do
           /^filesystem_store_datadir = foo$/)
       end
 
-      it 'notifies image-api restart' do
+      it 'notifies glance-api restart' do
-        expect(file).to notify('service[image-api]').to(:restart)
+        expect(file).to notify('service[glance-api]').to(:restart)
       end
 
       it 'does not have caching enabled by default' do
@@ -210,8 +210,8 @@ describe 'openstack-image::api' do
         pending 'TODO: implement'
       end
 
-      it 'notifies image-api restart' do
+      it 'notifies glance-api restart' do
-        expect(file).to notify('service[image-api]').to(:restart)
+        expect(file).to notify('service[glance-api]').to(:restart)
       end
     end
 
@@ -231,8 +231,8 @@ describe 'openstack-image::api' do
         pending 'TODO: implement'
       end
 
-      it 'notifies image-api restart' do
+      it 'notifies glance-api restart' do
-        expect(file).to notify('service[image-api]').to(:restart)
+        expect(file).to notify('service[glance-api]').to(:restart)
       end
 
       it 'has the default image_cache_dir setting' do
@@ -288,8 +288,8 @@ describe 'openstack-image::api' do
         pending 'TODO: implement'
       end
 
-      it 'notifies image-api restart' do
+      it 'notifies glance-api restart' do
-        expect(file).to notify('service[image-api]').to(:restart)
+        expect(file).to notify('service[glance-api]').to(:restart)
       end
     end
 

spec/registry_spec.rb

@@ -85,8 +85,8 @@ describe 'openstack-image::registry' do
         expect(chef_run).to render_file(file.name).with_content(match)
       end
 
-      it 'notifies image-registry restart' do
+      it 'notifies glance-registry restart' do
-        expect(file).to notify('service[image-registry]').to(:restart)
+        expect(file).to notify('service[glance-registry]').to(:restart)
       end
     end
 
@@ -121,8 +121,8 @@ describe 'openstack-image::registry' do
         pending 'TODO: implement'
       end
 
-      it 'notifies image-registry restart' do
+      it 'notifies glance-registry restart' do
-        expect(file).to notify('service[image-registry]').to(:restart)
+        expect(file).to notify('service[glance-registry]').to(:restart)
       end
     end
   end