Skip to content
Permalink
Browse files

Let stockpile set container_cli

With the addition of cloud-bulldozer/stockpile@a8b256c
and cloud-bulldozer/stockpile@3791692 we can have stockpile
set the var so that's one less var for the user to set.

Change-Id: Ic0e31549685d0f66fe09b4dc1694945f3071b873
  • Loading branch information...
smalleni committed Nov 5, 2019
1 parent 1b9718b commit f539cbbf889bd62d10131d24f30063381c4a6bea
@@ -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:
@@ -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
@@ -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
@@ -32,9 +32,6 @@ mapping:
ssh_config:
type: str
required: True
container_cli:
type: str
required: True
elasticsearch:
required: True
type: map
@@ -93,9 +93,8 @@ def check_metadata(self):
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():
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

0 comments on commit f539cbb

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