Skip to content
Permalink
Browse files

Merge "Allow specify container_cli"

  • Loading branch information...
Zuul authored and openstack-gerrit committed Jul 22, 2019
2 parents 6e2b9b8 + 46a1733 commit fdc75bed6a75b13be797a48e228a32696510f3c4
@@ -1,4 +1,7 @@
---
#
# For podman containers change "container_cli" configuration to podman
#

- hosts: stockpile
tasks:
@@ -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
@@ -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
@@ -32,6 +32,9 @@ mapping:
ssh_config:
type: str
required: True
container_cli:
type: str
required: True
elasticsearch:
required: True
type: map
@@ -93,8 +93,10 @@ def check_metadata(self):
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")
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

0 comments on commit fdc75be

Please sign in to comment.
You can’t perform that action at this time.