Remove kolla-host role, replace with a dev-tools role to install useful packages

This commit is contained in:
Mark Goddard 2017-03-16 10:50:35 +00:00
parent c26b30e0bd
commit d16eaf1502
7 changed files with 22 additions and 25 deletions

5
ansible/dev-tools.yml Normal file
View File

@ -0,0 +1,5 @@
---
- name: Ensure development tools are installed
hosts: seed:controllers
roles:
- role: dev-tools

View File

@ -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
hosts: controllers
tasks:

View 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 }}"

View File

@ -0,0 +1,7 @@
---
- name: Ensure required packages are installed
yum:
name: "{{ item }}"
state: installed
become: True
with_items: "{{ dev_tools_packages }}"

View File

@ -1,3 +0,0 @@
---
# SSH public key to be authorized by the Kolla host.
kolla_authorized_key:

View File

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

View File

@ -147,7 +147,7 @@ class SeedHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, Command):
var_name="kayobe_ansible_user")
playbooks = _build_playbook_list(
"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")
kolla_ansible.run_seed(parsed_args, "bootstrap-servers",
extra_vars={"ansible_user": ansible_user})
@ -244,7 +244,7 @@ class OvercloudHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, Command):
var_name="kayobe_ansible_user")
playbooks = _build_playbook_list(
"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")
kolla_ansible.run_overcloud(parsed_args, "bootstrap-servers",
extra_vars={"ansible_user": ansible_user})