openstack/tripleo-common
Code Issues Proposed changes

octavia: parameterize calls to container cli

Browse Source 
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
This commit is contained in:
Brent Eagles 2019-03-14 12:05:01 -02:30
parent b9ecb23918
commit df1980a385
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/octavia-files.yaml
View File

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

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

@ -40,5 +40,5 @@
- name: restart octavia containers - name: restart octavia containers
become: true become: true
become_user: root 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 when: octavia_config_updated

2
workbooks/octavia_post.yaml
View File

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