x/browbeat
Code Issues Proposed changes

Allow specify container_cli

Browse Source 
In OSP15, the default containers are podman. So we need
to pass container_cli environment variable as "podman"
so that the podman containers configuration file on the
undercloud can be parsed.

Change-Id: I223c46baf4cf36596c8ff1e7468eb9fd1a0f1126
Signed-off-by: Charles Short <chucks@redhat.com>
This commit is contained in:
Charles Short 2019-07-15 15:46:09 -04:00
parent 3d9478aef2
commit 46a17336b1
25 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/gather/stockpile.yml
View File

@ -1,4 +1,7 @@
---
#
# For podman containers change "container_cli" configuration to podman
#
- hosts: stockpile
tasks:

1
browbeat-complete.yaml
View File

@ -7,6 +7,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: true
host: 1.1.1.1

1
browbeat-config.yaml
View File

@ -11,6 +11,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

3
browbeat/schema/browbeat.yml
View File

@ -32,6 +32,9 @@ mapping:
ssh_config:
type: str
required: True
container_cli:
type: str
required: True
elasticsearch:
required: True
type: map

6
browbeat/tools.py
View File

@ -93,8 +93,10 @@ class Tools(object):
def gather_metadata(self):
os.putenv("ANSIBLE_SSH_ARGS", " -F {}".format(self.config['ansible']['ssh_config']))
ansible_cmd = \
'ansible-playbook -i {} {}' \
.format(self.config['ansible']['hosts'], self.config['ansible']['metadata_playbook'])
'ansible-playbook -e container_cli={} -i {} {}' \
.format(self.config['ansible']['container_cli'],
self.config['ansible']['hosts'],
self.config['ansible']['metadata_playbook'])
self.run_cmd(ansible_cmd)
if not self.check_metadata():
self.logger.warning("Metadata could not be gathered")

1
conf/browbeat-glance-complete.yaml
View File

@ -7,6 +7,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/browbeat-keystone-complete.yaml
View File

@ -8,6 +8,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/browbeat-keystone-minimal.yaml
View File

@ -8,6 +8,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/browbeat-workloads.yml
View File

@ -7,6 +7,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/ceilometer-minimal.yaml
View File

@ -7,6 +7,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/ceilometer-persist-response-timing.yaml
View File

@ -10,6 +10,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/gnocchi-minimal.yaml
View File

@ -8,6 +8,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/perfkit-benchmarks.yaml
View File

@ -12,6 +12,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/quickstart.yml
View File

@ -7,6 +7,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml
View File

@ -14,6 +14,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml
View File

@ -14,6 +14,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml
View File

@ -14,6 +14,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml
View File

@ -14,6 +14,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/telemetry-nova-persist-instances-with-network-fip.yaml
View File

@ -11,6 +11,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml
View File

@ -11,6 +11,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/telemetry-nova-persist-instances-with-network-volume.yaml
View File

@ -10,6 +10,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/telemetry-nova-persist-instances-with-network.yaml
View File

@ -12,6 +12,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/telemetry-nova-persist-instances-with-volume.yaml
View File

@ -10,6 +10,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
conf/telemetry-nova-persist-instances.yaml
View File

@ -11,6 +11,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/stockpile.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: 1.1.1.1

1
tests/data/valid_browbeat.yml
View File

@ -7,6 +7,7 @@ ansible:
hosts: ansible/hosts
metadata_playbook: ansible/gather/site.yml
ssh_config: ansible/ssh-config
container_cli: docker
elasticsearch:
enabled: false
host: browbeat.test.com