Remove kolla-host role, replace with a dev-tools role to install useful packages
This commit is contained in:
parent
c26b30e0bd
commit
d16eaf1502
5
ansible/dev-tools.yml
Normal file
5
ansible/dev-tools.yml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
- name: Ensure development tools are installed
|
||||||
|
hosts: seed:controllers
|
||||||
|
roles:
|
||||||
|
- role: dev-tools
|
@ -1,10 +1,4 @@
|
|||||||
---
|
---
|
||||||
- name: Ensure Kolla hosts are configured
|
|
||||||
hosts: seed:controllers
|
|
||||||
roles:
|
|
||||||
- role: kolla-host
|
|
||||||
kolla_authorized_key: "{{ lookup('file', ssh_public_key_path) }}"
|
|
||||||
|
|
||||||
- name: Ensure Kolla host services are configured
|
- name: Ensure Kolla host services are configured
|
||||||
hosts: controllers
|
hosts: controllers
|
||||||
tasks:
|
tasks:
|
||||||
|
8
ansible/roles/dev-tools/defaults/main.yml
Normal file
8
ansible/roles/dev-tools/defaults/main.yml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
# List of default packages to install.
|
||||||
|
dev_tools_packages_default:
|
||||||
|
- tcpdump
|
||||||
|
- vim
|
||||||
|
|
||||||
|
# List of packages to install.
|
||||||
|
dev_tools_packages: "{{ dev_tools_packages_default }}"
|
7
ansible/roles/dev-tools/tasks/main.yml
Normal file
7
ansible/roles/dev-tools/tasks/main.yml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
- name: Ensure required packages are installed
|
||||||
|
yum:
|
||||||
|
name: "{{ item }}"
|
||||||
|
state: installed
|
||||||
|
become: True
|
||||||
|
with_items: "{{ dev_tools_packages }}"
|
@ -1,3 +0,0 @@
|
|||||||
---
|
|
||||||
# SSH public key to be authorized by the Kolla host.
|
|
||||||
kolla_authorized_key:
|
|
@ -1,14 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Ensure required packages are installed
|
|
||||||
yum:
|
|
||||||
name: "{{ item }}"
|
|
||||||
state: installed
|
|
||||||
become: True
|
|
||||||
with_items:
|
|
||||||
- vim
|
|
||||||
|
|
||||||
- name: Ensure Kolla user has authorized our SSH key
|
|
||||||
authorized_key:
|
|
||||||
user: kolla
|
|
||||||
key: "{{ kolla_authorized_key }}"
|
|
||||||
become: True
|
|
@ -147,7 +147,7 @@ class SeedHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, Command):
|
|||||||
var_name="kayobe_ansible_user")
|
var_name="kayobe_ansible_user")
|
||||||
playbooks = _build_playbook_list(
|
playbooks = _build_playbook_list(
|
||||||
"ip-allocation", "ssh-known-host", "kayobe-ansible-user",
|
"ip-allocation", "ssh-known-host", "kayobe-ansible-user",
|
||||||
"disable-selinux", "network", "ntp", "lvm")
|
"dev-tools", "disable-selinux", "network", "ntp", "lvm")
|
||||||
ansible.run_playbooks(parsed_args, playbooks, limit="seed")
|
ansible.run_playbooks(parsed_args, playbooks, limit="seed")
|
||||||
kolla_ansible.run_seed(parsed_args, "bootstrap-servers",
|
kolla_ansible.run_seed(parsed_args, "bootstrap-servers",
|
||||||
extra_vars={"ansible_user": ansible_user})
|
extra_vars={"ansible_user": ansible_user})
|
||||||
@ -244,7 +244,7 @@ class OvercloudHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, Command):
|
|||||||
var_name="kayobe_ansible_user")
|
var_name="kayobe_ansible_user")
|
||||||
playbooks = _build_playbook_list(
|
playbooks = _build_playbook_list(
|
||||||
"ip-allocation", "ssh-known-host", "kayobe-ansible-user",
|
"ip-allocation", "ssh-known-host", "kayobe-ansible-user",
|
||||||
"disable-selinux", "network", "ntp", "lvm")
|
"dev-tools", "disable-selinux", "network", "ntp", "lvm")
|
||||||
ansible.run_playbooks(parsed_args, playbooks, limit="controllers")
|
ansible.run_playbooks(parsed_args, playbooks, limit="controllers")
|
||||||
kolla_ansible.run_overcloud(parsed_args, "bootstrap-servers",
|
kolla_ansible.run_overcloud(parsed_args, "bootstrap-servers",
|
||||||
extra_vars={"ansible_user": ansible_user})
|
extra_vars={"ansible_user": ansible_user})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user