Merge "Use right oslo.service entry points"

diff --cc tools/config/generate_sample.sh
index ba4f7c1b79ea6b4417cf7eb1662f21420337fa21,308304499d1738505b47a2664cddf48ba40ea645..842777b361dce4e92cfd6b418ab81b99293731b8
--- 1/tools/config/generate_sample.sh
--- 2/tools/config/generate_sample.sh
+++ b/tools/config/generate_sample.sh
@@@ -152,8 -152,7 +152,9 @@@ oslo-config-generator 
  --namespace oslo.messaging \
  --namespace oslo.i18n \
  --namespace oslo.middleware \
- --namespace oslo.service \
+ --namespace oslo.service.service \
+ --namespace oslo.service.periodic_task \
  --namespace policy \
 +--namespace oslo.policy \
 +--namespace oslo.db.concurrency \
  --namespace keystonemiddleware.auth_token | grep -v '^\[DEFAULT\]'  >> $OUTPUTFILE