From d602033495190591f7c235722295d7fe1be202e3 Mon Sep 17 00:00:00 2001 From: Adrien Cunin Date: Thu, 8 Dec 2016 14:47:22 +0100 Subject: [PATCH] Expose magnum_cert_manager_type and set default Default is x509keypair so Barbican is not required. Change-Id: I9c29f687f77770c16568423ec86fadb96aa3aced --- defaults/main.yml | 4 ++++ templates/magnum.conf.j2 | 3 +++ tests/magnum-test-vars.yml | 6 ++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index bd2bc67..ea46494 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -114,3 +114,7 @@ magnum_pip_packages: # pip packages required by this role. The value is picked up # by the py_pkgs lookup. magnum_role_project_group: magnum_all + +# Store certificates in DB by default (x509keypair) +# Other valid values are: barbican, local +magnum_cert_manager_type: x509keypair diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2 index d10fb75..21fd277 100644 --- a/templates/magnum.conf.j2 +++ b/templates/magnum.conf.j2 @@ -66,3 +66,6 @@ rabbit_notification_topic = notification trustee_domain_admin_password = {{ magnum_trustee_password }} trustee_domain_admin_name = {{ magnum_trustee_domain_admin_name }} trustee_domain_name = {{ magnum_trustee_domain_name }} + +[certificates] +cert_manager_type = {{ magnum_cert_manager_type }} diff --git a/tests/magnum-test-vars.yml b/tests/magnum-test-vars.yml index 73d701e..0006db9 100644 --- a/tests/magnum-test-vars.yml +++ b/tests/magnum-test-vars.yml @@ -13,10 +13,8 @@ magnum_galera_database_name: magnum_service magnum_galera_user: magnum # TODO: Install and use barbican for certificate management -# Override use of barbican -magnum_config_overrides: - certificates: - cert_manager_type: x509keypair +# Make sure we use x509keypair for now +magnum_cert_manager_type: x509keypair magnum_glance_images: - name: fedora-atomic-latest