openstack/kayobe
Code Issues Proposed changes

Merge pull request #72 from autonomouse/kolla_nova_compute_ironic_group_fix

Browse Source 
(potential) fix for https://github.com/stackhpc/kayobe/issues/71
This commit is contained in:
Mark Goddard 2017-11-13 16:27:44 +00:00 committed by GitHub
commit 7b4135095e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/group_vars/all/nova
View File

@ -2,6 +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 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,9 +210,10 @@ 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 all hosts in the nova group are used instead - typically the
# controllers.
kolla_nova_compute_ironic_host:
###############################################################################
# Extra free-form configuraton.

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

@ -37,11 +37,16 @@ nova
[nova-spicehtml5proxy:children]
nova
[nova-compute-ironic:children]
# NOTE: HA for nova-compute services with ironic is still an experimental
# feature. Provide the option to use a single compute host, even when multiple
# controllers are in use.
{{ kolla_nova_compute_ironic_group }}
{% if kolla_nova_compute_ironic_host is not none %}
[nova-compute-ironic]
{{ kolla_nova_compute_ironic_host }}
{% else %}
[nova-compute-ironic:children]
nova
{% endif %}
[nova-serialproxy:children]
nova

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.