Let stockpile set container_cli

With the addition of a8b256cad6
and 3791692021 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

@@ -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:

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

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

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

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 {} {}' \
+            'ansible-playbook -i {} {}' \
-            .format(self.config['ansible']['container_cli'],
+            .format(self.config['ansible']['hosts'],
-                    self.config['ansible']['hosts'],
                     self.config['ansible']['metadata_playbook'])
         self.run_cmd(ansible_cmd)
         if not self.check_metadata():

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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