Add extra barbican services

This patch adds option to easily enable barbican extra services.
It replaces barbican service with barbican-api with same functionality.

Change-Id: I76494288e17f1801b4f1055cbb4d9b6b4bd4f475

defaults/main.yml

@@ -43,16 +43,15 @@ barbican_etc_directory: /etc/barbican
 barbican_vassals_directory: "{{ barbican_etc_directory }}/vassals"
 
 #Barbican services info
-barbican_api_program_name: barbican-api
-barbican_keystone_listener_program_name: barbican-keystone-listener
-barbican_worker_program_name: barbican-worker
-barbican_retry_program_name: barbican-retry
+barbican_keystone_listener_enable: false
+barbican_worker_enable: false
+barbican_retry_enable: false
 
 ## Service Name-Group Mapping
 barbican_services:
-  barbican:
+  barbican-api:
     group: barbican_all
-    service_name: barbican
+    service_name: barbican-api
     init_config_overrides: "{{ barbican_init_config_overrides }}"
     execstarts: >-
       {{ barbican_uwsgi_bin }}/uwsgi
@@ -60,6 +59,27 @@ barbican_services:
       --die-on-term
       --emperor {{ barbican_vassals_directory }}
     start_order: 1
+  barbican-worker:
+    group: barbican_all
+    service_name: barbican-worker
+    init_config_overrides: "{{ barbican_init_config_overrides }}"
+    execstarts: "{{ barbican_bin }}/barbican-worker"
+    condition: "{{ barbican_worker_enable | bool }}"
+    start_order: 2
+  barbican-keystone-listener:
+    group: barbican_all
+    service_name: barbican-keystone-listener
+    init_config_overrides: "{{ barbican_init_config_overrides }}"
+    execstarts: "{{ barbican_bin }}/barbican-keystone-listener"
+    condition: "{{ barbican_keystone_listener_enable | bool }}"
+    start_order: 3
+  barbican-retry:
+    group: barbican_all
+    service_name: barbican-retry
+    init_config_overrides: "{{ barbican_init_config_overrides }}"
+    execstarts: "{{ barbican_bin }}/barbican-retry"
+    condition: "{{ barbican_retry_enable | bool }}"
+    start_order: 4
 
 ## Service Type and Data
 barbican_service_name: barbican

handlers/main.yml

@@ -13,6 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NOTE (noonedeadpunk): this handler is added to stop old barbican service
+# which was renamed to barbican-api, so that it don't interfer during upgrade.
+# Should be removed after Ussuri release
+- name: Stop obsoleted barbican service
+  systemd:
+    name: barbican
+    state: "stopped"
+    enabled: no
+  failed_when: false
+  listen:
+    - "Restart barbican services"
+    - "venv changed"
+
 - name: Restart barbican services
   systemd:
     name: "{{ item.service_name }}"

releasenotes/notes/barbican-api-a656fd2d8f1923a8.yaml

@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    Barbican service was renamed to barbican-api. During upgrade old barbican
+    service will be stopped and barbican-api will be started instead. Also
+    `barbican_*_program_name` was removed since had no effect and wasn't used.
+    Instead variable `barbican_*_enabled` was introduced to ease enabling
+    barbican services like barbican-worker, barbican-keystone-listener and
+    barbican-retry.