openstack/openstack-ansible-ops
Code Issues Proposed changes

MNAIO: Remove mnaio_hosts group and use vm_hosts only

Browse Source 
The mnaio_hosts group is redundant. We switch to just using the
vm_hosts group instead.

Change-Id: I854befd283b62c98e956a5e677ca9d7dbd33416b
This commit is contained in:
Jesse Pretorius 2018-09-26 12:29:13 +01:00
parent 49340c566d
commit 14567e0c3c
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multi-node-aio/build.sh
View File

@ -19,7 +19,7 @@ source bootstrap.sh
source ansible-env.rc source ansible-env.rc
ansible mnaio_hosts \ ansible vm_hosts \
-i ${MNAIO_INVENTORY:-"playbooks/inventory"} \ -i ${MNAIO_INVENTORY:-"playbooks/inventory"} \
-m pip \ -m pip \
-a "name=netaddr" -a "name=netaddr"

1
multi-node-aio/playbooks/deploy-vms.yml
View File

@ -226,6 +226,7 @@
- "{{ playbook_dir }}/vars/{{ ansible_os_family | lower }}.yml" - "{{ playbook_dir }}/vars/{{ ansible_os_family | lower }}.yml"
tags: tags:
- always - always
- name: Start the VM - name: Start the VM
virt: virt:
name: "{{ hostvars[item]['server_hostname'] }}" name: "{{ hostvars[item]['server_hostname'] }}"

0
multi-node-aio/playbooks/group_vars/mnaio_hosts.yml → multi-node-aio/playbooks/group_vars/vm_hosts.yml
View File

7
multi-node-aio/playbooks/inventory/hosts
View File

@ -27,13 +27,6 @@ swift3 ansible_host=10.0.236.142
[vm_hosts] [vm_hosts]
mnaio1 mnaio1
################################## PXE HOSTS ##################################
# The group "mnaio_hosts" is used to define all host machines that will serve
# the purpose of running an MNAIO test environment.
[mnaio_hosts]
mnaio1
# The group "pxe_hosts" is used to setup all systems that will be responsible # The group "pxe_hosts" is used to setup all systems that will be responsible
# for PXE boot. This will install all of the needed capabilities to TFTP serve # for PXE boot. This will install all of the needed capabilities to TFTP serve
# system images. # system images.

2
multi-node-aio/playbooks/setup-host.yml
View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
- name: Gather facts - name: Gather facts
hosts: mnaio_hosts hosts: vm_hosts
gather_facts: "{{ gather_facts | default(true) }}" gather_facts: "{{ gather_facts | default(true) }}"
environment: "{{ deployment_environment_variables | default({}) }}" environment: "{{ deployment_environment_variables | default({}) }}"
tags: tags: