openstack
/
kayobe
Code Issues Proposed changes

The default group doesn't need to be configurable

This commit is contained in:
Darren Hoyland 2017-11-13 16:16:01 +00:00
parent 77c13fe626
commit 80b30b8a98
5 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/group_vars/all/nova
View File

@ -2,10 +2,7 @@
###############################################################################
# Nova configuration.
# Which group to use to deploy the nova-compute services for ironic. By default
# all hosts in the nova group are used - typically the controllers.
kolla_nova_compute_ironic_group: nova
# Which host to use to deploy the nova-compute services for ironic. By default
# this is none and the kolla_nova_compute_ironic_group is used instead.
# this is none and all hosts in the nova group are used instead - typically the
# controllers.
kolla_nova_compute_ironic_host:

7
ansible/roles/kolla-ansible/defaults/main.yml
View File

@ -210,12 +210,9 @@ kolla_openstack_logging_debug:
# Nova options
#######################
# Which group to use to deploy the nova-compute services for ironic. By default
# all hosts in the nova group are used - typically the controllers.
kolla_nova_compute_ironic_group: nova
# Which host to use to deploy the nova-compute services for ironic. By default
# this is none and the kolla_nova_compute_ironic_group is used instead.
# this is none and all hosts in the nova group are used instead - typically the
# controllers.
kolla_nova_compute_ironic_host:
###############################################################################

2
ansible/roles/kolla-ansible/templates/overcloud-services.j2
View File

@ -45,7 +45,7 @@ nova
{{ kolla_nova_compute_ironic_host }}
{% else %}
[nova-compute-ironic:children]
{{ kolla_nova_compute_ironic_group }}
nova
{% endif %}
[nova-serialproxy:children]

2
doc/source/release-notes.rst
View File

@ -20,7 +20,7 @@ Features
* Adds support for specifying a local Yum mirror for package installation.
* Adds the command ``kayobe network connectivity check`` which can be used to
verify network connectivity in the cloud hosts.
* Adds a variable ``kolla_nova_compute_ironic_group`` which may be used to set
* Adds a variable ``kolla_nova_compute_ironic_host`` which may be used to set
which hosts run the nova compute service for ironic. This may be used to
avoid the experimental HA nova compute service for ironic, by specifying a
single host.

7
etc/kayobe/nova.yml
View File

@ -2,9 +2,10 @@
###############################################################################
# Nova configuration.
# Which group to use to deploy the nova-compute services for ironic. By default
# all hosts in the nova group are used - typically the controllers.
#kolla_nova_compute_ironic_group:
# Which host to use to deploy the nova-compute services for ironic. By default
# this is none and all hosts in the nova group are used instead - typically the
# controllers.
#kolla_nova_compute_ironic_host:
###############################################################################
# Dummy variable to allow Ansible to accept this file.