opencontrail extraconfig hieradata interpolation broken on mitaka/liberty

[Steven Hardy]

I think we fixed this in newton due to the composable services refactor, but on mitaka and liberty we do this:

[shardy@localhost tripleo-heat-templates]$ grep -R "keystone_auth_uri" ./*
./puppet/extraconfig/pre_deploy/controller/neutron-opencontrail.yaml: neutron::plugins::opencontrail::keystone_auth_url: '"%{hiera(''keystone_auth_uri'')}"'

./puppet/controller.yaml: keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
./puppet/controller.yaml: swift::proxy::authtoken::auth_uri: {get_input: keystone_auth_uri}
./puppet/controller.yaml: cinder::api::auth_uri: {get_input: keystone_auth_uri}
./puppet/controller.yaml: glance::api::auth_uri: {get_input: keystone_auth_uri}
./puppet/controller.yaml: glance::registry::auth_uri: {get_input: keystone_auth_uri}
./puppet/controller.yaml: glance::backend::swift::swift_store_auth_address: {get_input: keystone_auth_uri}
./puppet/controller.yaml: heat::auth_uri: {get_input: keystone_auth_uri}
./puppet/controller.yaml: neutron::server::auth_uri: {get_input: keystone_auth_uri}
./puppet/controller.yaml: ceilometer::api::keystone_auth_uri: {get_input: keystone_auth_uri}
./puppet/controller.yaml: ceilometer::agent::auth::auth_url: {get_input: keystone_auth_uri}
./puppet/controller.yaml: nova::api::auth_uri: {get_input: keystone_auth_uri}
./puppet/controller.yaml: horizon::keystone_url: {get_input: keystone_auth_uri}

We can see that '"%{hiera(''keystone_auth_uri'')}"' won't work, because it's not referencing any hiera key, instead it's referencing an input to the ControllerDeployment.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/mitaka
Review: https://review.openstack.org/393292

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/393340

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/393292
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=2bfd1cd79fbf9ce4b62026c37facfca63b550bb3
Submitter: Jenkins
Branch: stable/mitaka

commit 2bfd1cd79fbf9ce4b62026c37facfca63b550bb3
Author: Steven Hardy <email address hidden>
Date: Thu Nov 3 12:37:22 2016 +0000

    Correct opencontrail hiera interpolation key

    We reference keystone_auth_uri, but this isn't actually written as a
    hieradata key in controller.yaml. Intead we need to reference a
    per-service key which contains the data (as these are written in
    controller.yaml). Using the neutron::server key seems reasonable since
    this is enabling a neutron plugin.

    Note this is a mitaka/liberty only fix because we fixed this already during
    the refactoring of neutron-opencontrail.yaml into the composable services
    format during the Newton cycle.

    Change-Id: Id240709e256b057bbdff038aefc7fcacb0d339b8
    Closes-Bug: 1638901

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/393340
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=f76a003491846e7f305eff800048464afe8043f0
Submitter: Jenkins
Branch: stable/liberty

commit f76a003491846e7f305eff800048464afe8043f0
Author: Steven Hardy <email address hidden>
Date: Thu Nov 3 12:37:22 2016 +0000

    Correct opencontrail hiera interpolation key

    We reference keystone_auth_uri, but this isn't actually written as a
    hieradata key in controller.yaml. Intead we need to reference a
    per-service key which contains the data (as these are written in
    controller.yaml). Using the neutron::server key seems reasonable since
    this is enabling a neutron plugin.

    Note this is a mitaka/liberty only fix because we fixed this already during
    the refactoring of neutron-opencontrail.yaml into the composable services
    format during the Newton cycle.

    Change-Id: Id240709e256b057bbdff038aefc7fcacb0d339b8
    Closes-Bug: 1638901

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 2.2.0 release.

[Emilien Macchi (emilienm)]

There are no currently open reviews on this bug, changing the status back to the previous state and unassigning. If there are active reviews related to this bug, please include links in comments.