From f539cbbf889bd62d10131d24f30063381c4a6bea Mon Sep 17 00:00:00 2001 From: Sai Sindhur Malleni Date: Tue, 5 Nov 2019 14:59:01 -0500 Subject: [PATCH] Let stockpile set container_cli With the addition of https://github.com/cloud-bulldozer/stockpile/commit/a8b256cad60261ad11bc1f56100bd1e862ac19c0 and https://github.com/cloud-bulldozer/stockpile/commit/379169202153c7a726d972b2b1af160469d37563 we can have stockpile set the var so that's one less var for the user to set. Change-Id: Ic0e31549685d0f66fe09b4dc1694945f3071b873 --- ansible/gather/stockpile.yml | 2 -- browbeat-complete.yaml | 1 - browbeat-config.yaml | 1 - browbeat/schema/browbeat.yml | 3 --- browbeat/tools.py | 5 ++--- 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 - ...metry-nova-persist-instances-with-network-volume-fip.yaml | 1 - ...telemetry-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, 2 insertions(+), 30 deletions(-) diff --git a/ansible/gather/stockpile.yml b/ansible/gather/stockpile.yml index 1920eab33..8f8f52b4a 100644 --- a/ansible/gather/stockpile.yml +++ b/ansible/gather/stockpile.yml @@ -15,14 +15,12 @@ - name: setting facts set_fact: overcloud_user: "{{ host_remote_user }}" - container_cli: "{{ container_cli }}" - hosts: undercloud tasks: - name: setting facts set_fact: undercloud_user: "{{ local_remote_user }}" - container_cli: "{{ container_cli }}" - import_playbook: stockpile/config/featureset001.yml vars: diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml index 9facd5862..52a1ad23b 100644 --- a/browbeat-complete.yaml +++ b/browbeat-complete.yaml @@ -7,7 +7,6 @@ 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 f209f44f1..72195a0bf 100644 --- a/browbeat-config.yaml +++ b/browbeat-config.yaml @@ -11,7 +11,6 @@ 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 5edabeb62..631e19dbd 100644 --- a/browbeat/schema/browbeat.yml +++ b/browbeat/schema/browbeat.yml @@ -32,9 +32,6 @@ 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 3df71ef37..1c0a5ef78 100644 --- a/browbeat/tools.py +++ b/browbeat/tools.py @@ -93,9 +93,8 @@ class Tools(object): def gather_metadata(self): os.putenv("ANSIBLE_SSH_ARGS", " -F {}".format(self.config['ansible']['ssh_config'])) ansible_cmd = \ - 'ansible-playbook -e container_cli={} -i {} {}' \ - .format(self.config['ansible']['container_cli'], - self.config['ansible']['hosts'], + 'ansible-playbook -i {} {}' \ + .format(self.config['ansible']['hosts'], self.config['ansible']['metadata_playbook']) self.run_cmd(ansible_cmd) if not self.check_metadata(): diff --git a/conf/browbeat-glance-complete.yaml b/conf/browbeat-glance-complete.yaml index 2ff285ee9..4257a703c 100644 --- a/conf/browbeat-glance-complete.yaml +++ b/conf/browbeat-glance-complete.yaml @@ -7,7 +7,6 @@ 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 9de3af272..cf6efbf3c 100644 --- a/conf/browbeat-keystone-complete.yaml +++ b/conf/browbeat-keystone-complete.yaml @@ -8,7 +8,6 @@ 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 b3a6151e9..dbdc4f2ee 100644 --- a/conf/browbeat-keystone-minimal.yaml +++ b/conf/browbeat-keystone-minimal.yaml @@ -8,7 +8,6 @@ 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 d176d96d8..ced9c15e2 100644 --- a/conf/browbeat-workloads.yml +++ b/conf/browbeat-workloads.yml @@ -7,7 +7,6 @@ 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 c5bfdb6a9..3b35b0caa 100644 --- a/conf/ceilometer-minimal.yaml +++ b/conf/ceilometer-minimal.yaml @@ -7,7 +7,6 @@ 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 4df004a12..37506bef0 100644 --- a/conf/ceilometer-persist-response-timing.yaml +++ b/conf/ceilometer-persist-response-timing.yaml @@ -10,7 +10,6 @@ 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 ab55b55dd..274b0a1bf 100644 --- a/conf/gnocchi-minimal.yaml +++ b/conf/gnocchi-minimal.yaml @@ -8,7 +8,6 @@ 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 ec1906840..337d4f3a4 100644 --- a/conf/perfkit-benchmarks.yaml +++ b/conf/perfkit-benchmarks.yaml @@ -12,7 +12,6 @@ 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 5b85d3b89..9762d610d 100644 --- a/conf/quickstart.yml +++ b/conf/quickstart.yml @@ -7,7 +7,6 @@ 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 1c41bd75c..d38d313e1 100644 --- a/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml @@ -14,7 +14,6 @@ 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 e540eebf5..6dac54af1 100644 --- a/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml @@ -14,7 +14,6 @@ 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 5c8be03a8..3cc7a2260 100644 --- a/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml @@ -14,7 +14,6 @@ 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 a4fd31e4c..d4aeb11d3 100644 --- a/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml @@ -14,7 +14,6 @@ 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 bfb3ea8b1..df1263ab5 100644 --- a/conf/telemetry-nova-persist-instances-with-network-fip.yaml +++ b/conf/telemetry-nova-persist-instances-with-network-fip.yaml @@ -11,7 +11,6 @@ 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 4d661fe5b..121ca171d 100644 --- a/conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml +++ b/conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml @@ -11,7 +11,6 @@ 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 0589d74a2..2fdab6749 100644 --- a/conf/telemetry-nova-persist-instances-with-network-volume.yaml +++ b/conf/telemetry-nova-persist-instances-with-network-volume.yaml @@ -10,7 +10,6 @@ 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 583f9d669..ee2c33124 100644 --- a/conf/telemetry-nova-persist-instances-with-network.yaml +++ b/conf/telemetry-nova-persist-instances-with-network.yaml @@ -12,7 +12,6 @@ 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 29c2bd5d0..c8f4edfc3 100644 --- a/conf/telemetry-nova-persist-instances-with-volume.yaml +++ b/conf/telemetry-nova-persist-instances-with-volume.yaml @@ -10,7 +10,6 @@ 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 a3ba431ac..650777f28 100644 --- a/conf/telemetry-nova-persist-instances.yaml +++ b/conf/telemetry-nova-persist-instances.yaml @@ -11,7 +11,6 @@ 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 b0b3c4433..87c19d7e8 100644 --- a/tests/data/valid_browbeat.yml +++ b/tests/data/valid_browbeat.yml @@ -7,7 +7,6 @@ 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