From 77c5f086f4dd9808e9aca81ba36f217cc642f1e6 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 15 Mar 2017 09:39:09 +0000 Subject: [PATCH] Add configuration for Bifrost image to Kolla globals.yml --- ansible/roles/kolla-ansible/templates/globals.yml.j2 | 8 ++++++++ kayobe/cli/commands.py | 6 +----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2 index 8669949de..1317d2f91 100644 --- a/ansible/roles/kolla-ansible/templates/globals.yml.j2 +++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2 @@ -247,6 +247,14 @@ tempest_floating_network_name: # 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 %} ####################### # Extra configuration diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py index d10ccc3a7..21552e2af 100644 --- a/kayobe/cli/commands.py +++ b/kayobe/cli/commands.py @@ -158,11 +158,7 @@ class SeedServiceDeploy(KollaAnsibleMixin, KayobeAnsibleMixin, Command): def take_action(self, parsed_args): self.app.LOG.debug("Deploying seed services") ansible.run_playbook(parsed_args, "ansible/kolla-bifrost.yml") - # FIXME: Do this via configuration. - extra_vars = {"kolla_install_type": "source", - "docker_namespace": "stackhpc"} - kolla_ansible.run_seed(parsed_args, "deploy-bifrost", - extra_vars=extra_vars) + kolla_ansible.run_seed(parsed_args, "deploy-bifrost") ansible.run_playbook(parsed_args, "ansible/seed-introspection-rules.yml")