From 46a17336b1124a4f8b33a36e142e581930537923 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Mon, 15 Jul 2019 15:46:09 -0400 Subject: [PATCH] Allow specify container_cli 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 --- ansible/gather/stockpile.yml | 3 +++ browbeat-complete.yaml | 1 + browbeat-config.yaml | 1 + browbeat/schema/browbeat.yml | 3 +++ browbeat/tools.py | 6 ++++-- conf/browbeat-glance-complete.yaml | 1 + conf/browbeat-keystone-complete.yaml | 1 + conf/browbeat-keystone-minimal.yaml | 1 + conf/browbeat-workloads.yml | 1 + conf/ceilometer-minimal.yaml | 1 + conf/ceilometer-persist-response-timing.yaml | 1 + conf/gnocchi-minimal.yaml | 1 + conf/perfkit-benchmarks.yaml | 1 + conf/quickstart.yml | 1 + conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml | 1 + conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml | 1 + conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml | 1 + conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml | 1 + conf/telemetry-nova-persist-instances-with-network-fip.yaml | 1 + ...etry-nova-persist-instances-with-network-volume-fip.yaml | 1 + ...elemetry-nova-persist-instances-with-network-volume.yaml | 1 + conf/telemetry-nova-persist-instances-with-network.yaml | 1 + conf/telemetry-nova-persist-instances-with-volume.yaml | 1 + conf/telemetry-nova-persist-instances.yaml | 1 + tests/data/valid_browbeat.yml | 1 + 25 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ansible/gather/stockpile.yml b/ansible/gather/stockpile.yml index d410270b6..b499d840b 100644 --- a/ansible/gather/stockpile.yml +++ b/ansible/gather/stockpile.yml @@ -1,4 +1,7 @@ --- +# +# For podman containers change "container_cli" configuration to podman +# - hosts: stockpile tasks: diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml index 52a1ad23b..9facd5862 100644 --- a/browbeat-complete.yaml +++ b/browbeat-complete.yaml @@ -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 diff --git a/browbeat-config.yaml b/browbeat-config.yaml index d2098a3a0..d867eaa40 100644 --- a/browbeat-config.yaml +++ b/browbeat-config.yaml @@ -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 diff --git a/browbeat/schema/browbeat.yml b/browbeat/schema/browbeat.yml index 631e19dbd..5edabeb62 100644 --- a/browbeat/schema/browbeat.yml +++ b/browbeat/schema/browbeat.yml @@ -32,6 +32,9 @@ mapping: ssh_config: type: str required: True + container_cli: + type: str + required: True elasticsearch: required: True type: map diff --git a/browbeat/tools.py b/browbeat/tools.py index 9267d4fb2..3df71ef37 100644 --- a/browbeat/tools.py +++ b/browbeat/tools.py @@ -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") diff --git a/conf/browbeat-glance-complete.yaml b/conf/browbeat-glance-complete.yaml index 4257a703c..2ff285ee9 100644 --- a/conf/browbeat-glance-complete.yaml +++ b/conf/browbeat-glance-complete.yaml @@ -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 diff --git a/conf/browbeat-keystone-complete.yaml b/conf/browbeat-keystone-complete.yaml index cf6efbf3c..9de3af272 100644 --- a/conf/browbeat-keystone-complete.yaml +++ b/conf/browbeat-keystone-complete.yaml @@ -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 diff --git a/conf/browbeat-keystone-minimal.yaml b/conf/browbeat-keystone-minimal.yaml index dbdc4f2ee..b3a6151e9 100644 --- a/conf/browbeat-keystone-minimal.yaml +++ b/conf/browbeat-keystone-minimal.yaml @@ -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 diff --git a/conf/browbeat-workloads.yml b/conf/browbeat-workloads.yml index ced9c15e2..d176d96d8 100644 --- a/conf/browbeat-workloads.yml +++ b/conf/browbeat-workloads.yml @@ -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 diff --git a/conf/ceilometer-minimal.yaml b/conf/ceilometer-minimal.yaml index 3b35b0caa..c5bfdb6a9 100644 --- a/conf/ceilometer-minimal.yaml +++ b/conf/ceilometer-minimal.yaml @@ -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 diff --git a/conf/ceilometer-persist-response-timing.yaml b/conf/ceilometer-persist-response-timing.yaml index 37506bef0..4df004a12 100644 --- a/conf/ceilometer-persist-response-timing.yaml +++ b/conf/ceilometer-persist-response-timing.yaml @@ -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 diff --git a/conf/gnocchi-minimal.yaml b/conf/gnocchi-minimal.yaml index 274b0a1bf..ab55b55dd 100644 --- a/conf/gnocchi-minimal.yaml +++ b/conf/gnocchi-minimal.yaml @@ -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 diff --git a/conf/perfkit-benchmarks.yaml b/conf/perfkit-benchmarks.yaml index 337d4f3a4..ec1906840 100644 --- a/conf/perfkit-benchmarks.yaml +++ b/conf/perfkit-benchmarks.yaml @@ -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 diff --git a/conf/quickstart.yml b/conf/quickstart.yml index 9762d610d..5b85d3b89 100644 --- a/conf/quickstart.yml +++ b/conf/quickstart.yml @@ -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 diff --git a/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml index d38d313e1..1c41bd75c 100644 --- a/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml @@ -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 diff --git a/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml index 6dac54af1..e540eebf5 100644 --- a/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml @@ -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 diff --git a/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml index 3cc7a2260..5c8be03a8 100644 --- a/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml @@ -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 diff --git a/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml index d4aeb11d3..a4fd31e4c 100644 --- a/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml @@ -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 diff --git a/conf/telemetry-nova-persist-instances-with-network-fip.yaml b/conf/telemetry-nova-persist-instances-with-network-fip.yaml index df1263ab5..bfb3ea8b1 100644 --- a/conf/telemetry-nova-persist-instances-with-network-fip.yaml +++ b/conf/telemetry-nova-persist-instances-with-network-fip.yaml @@ -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 diff --git a/conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml b/conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml index 121ca171d..4d661fe5b 100644 --- a/conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml +++ b/conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml @@ -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 diff --git a/conf/telemetry-nova-persist-instances-with-network-volume.yaml b/conf/telemetry-nova-persist-instances-with-network-volume.yaml index 2fdab6749..0589d74a2 100644 --- a/conf/telemetry-nova-persist-instances-with-network-volume.yaml +++ b/conf/telemetry-nova-persist-instances-with-network-volume.yaml @@ -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 diff --git a/conf/telemetry-nova-persist-instances-with-network.yaml b/conf/telemetry-nova-persist-instances-with-network.yaml index ee2c33124..583f9d669 100644 --- a/conf/telemetry-nova-persist-instances-with-network.yaml +++ b/conf/telemetry-nova-persist-instances-with-network.yaml @@ -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 diff --git a/conf/telemetry-nova-persist-instances-with-volume.yaml b/conf/telemetry-nova-persist-instances-with-volume.yaml index c8f4edfc3..29c2bd5d0 100644 --- a/conf/telemetry-nova-persist-instances-with-volume.yaml +++ b/conf/telemetry-nova-persist-instances-with-volume.yaml @@ -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 diff --git a/conf/telemetry-nova-persist-instances.yaml b/conf/telemetry-nova-persist-instances.yaml index 650777f28..a3ba431ac 100644 --- a/conf/telemetry-nova-persist-instances.yaml +++ b/conf/telemetry-nova-persist-instances.yaml @@ -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 diff --git a/tests/data/valid_browbeat.yml b/tests/data/valid_browbeat.yml index 87c19d7e8..b0b3c4433 100644 --- a/tests/data/valid_browbeat.yml +++ b/tests/data/valid_browbeat.yml @@ -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