openstack/kayobe
Code Issues Proposed changes

Add configuration for Bifrost image to Kolla globals.yml

Browse Source
This commit is contained in:
Mark Goddard 2017-03-15 09:39:09 +00:00
parent 6c04c49869
commit 77c5f086f4
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/kolla-ansible/templates/globals.yml.j2
View File

@ -247,6 +247,14 @@ tempest_floating_network_name:
# tempest_flavor_ref_alt_id: "{% raw %}{{ tempest_flavor_ref_id }}{% endraw %}" # tempest_flavor_ref_alt_id: "{% raw %}{{ tempest_flavor_ref_id }}{% endraw %}"
#####################################
# Bifrost - Bare Metal Provisioning
#####################################
# The Bifrost deployment image only supports a source installation.
bifrost_deploy_image: "{% raw %}{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-source-bifrost-deploy{% endraw %}"
{% if kolla_extra_globals %} {% if kolla_extra_globals %}
####################### #######################
# Extra configuration # Extra configuration

6
kayobe/cli/commands.py
View File

@ -158,11 +158,7 @@ class SeedServiceDeploy(KollaAnsibleMixin, KayobeAnsibleMixin, Command):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.app.LOG.debug("Deploying seed services") self.app.LOG.debug("Deploying seed services")
ansible.run_playbook(parsed_args, "ansible/kolla-bifrost.yml") ansible.run_playbook(parsed_args, "ansible/kolla-bifrost.yml")
# FIXME: Do this via configuration. kolla_ansible.run_seed(parsed_args, "deploy-bifrost")
extra_vars = {"kolla_install_type": "source",
"docker_namespace": "stackhpc"}
kolla_ansible.run_seed(parsed_args, "deploy-bifrost",
extra_vars=extra_vars)
ansible.run_playbook(parsed_args, "ansible/seed-introspection-rules.yml") ansible.run_playbook(parsed_args, "ansible/seed-introspection-rules.yml")