octavia: parameterize calls to container cli

The octavia ansible playbooks restart the octavia containers to pickup
generated configuration so this needs to be changed to take the value
from the heat environment.

Change-Id: I6ef5ae0cf8c8acdb6e9a9ab78e0deddd0ea968ec

playbooks/octavia-files.yaml

@@ -87,5 +87,6 @@
   gather_facts: True
   vars:
     octavia_confd_prefix: "/var/lib/config-data/puppet-generated/octavia"
+    container_cli: "{{ container_cli }}"
   roles:
     - octavia-controller-post-config

playbooks/roles/octavia-controller-post-config/tasks/main.yml

@@ -40,5 +40,5 @@
   - name: restart octavia containers
     become: true
     become_user: root
-    shell: "docker restart $(sudo docker ps -f name=octavia -q)"
+    shell: "{{ container_cli }} restart $(sudo {{ container_cli }} ps -f name=octavia -q)"
     when: octavia_config_updated

workbooks/octavia_post.yaml

@@ -37,6 +37,7 @@ workflows:
       - overcloud_password
       - overcloud_project
       - overcloud_pub_auth_uri
+      - container_cli
       - ansible_extra_env_variables:
           ANSIBLE_HOST_KEY_CHECKING: 'False'
           ANSIBLE_SSH_RETRIES: '3'
@@ -148,6 +149,7 @@ workflows:
             generate_certs: <% $.generate_certs %>
             mgmt_port_dev: <% $.mgmt_port_dev %>
             auth_project_name: <% $.auth_project_name %>
+            container_cli: <% $.container_cli %>
           execution_id: <% execution().id %>
         on-complete: purge_local_temp_dir
       purge_local_temp_dir: