[cinder] Deployment of environment with cinder role assigned to controller fails

[Alexey Deryugin]

build_id: 259
build_number: 259
api: 1.0
fuel-library_sha: 4fdf3d6b070204366593012428395d173698678a
nailgun_sha: 0dfcf73deb8ae99654f3da2ea95b7b68b9ee7273
feature_groups: experimental
fuel-nailgun-agent_sha: d7027952870a35db8dc52f185bb1158cdd3d1ebd
openstack_version: 2015.1.0-7.0
fuel-agent_sha: 082a47bf014002e515001be05f99040437281a2d
production: docker
python-fuelclient_sha: 9643fa07f1290071511066804f962f62fe27b512
astute_sha: e63709d16bd4c1949bef820ac336c9393c040d25
fuel-ostf_sha: 582a81ccaa1e439a3aec4b8b8f6994735de840f4
release: 7.0
fuelmain_sha: 9ab01caf960013dc882825dc9b0e11ccf0b81cb0

Steps to reproduce:
  Create environment:
     - Neutron with GRE
     - Enable Murano
     - Disable TLS
   Nodes:
     - 1 controller node with cinder role
     - 1 compute node with cinder role

Actual result:
  Deployment fails with error: Duplicate declaration: Cinder_config[DEFAULT/nova_catalog_info] is already declared in file /etc/puppet/modules/cinder/manifests/api.pp:294; cannot redeclare at /etc/puppet/modules/osnailyfacter/modular/roles/cinder.pp:296 on node node-2.domain.tld

This case wasn't covered by CI and BVT

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/220487

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/220487
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=49aabef70c036155ab58429252473efdeb171765
Submitter: Jenkins
Branch: master

commit 49aabef70c036155ab58429252473efdeb171765
Author: Denis Egorenko <email address hidden>
Date: Fri Sep 4 15:33:29 2015 +0300

    Remove duplicated Cinder's parameter

    We have outdated duplicated declaration in modular manifest for
    cinder role, for parameter 'nova_catalog_info' (it was added in
    upstream module: https://review.openstack.org/#/c/218899)

    Change-Id: I97a4a80692c9ea61870856224d2137b681d324bc
    Closes-bug: #1492258

[Alexander Arzhanov (aarzhanov)]

Verified on ISO #286:

api: '1.0'
astute_sha: 8283dc2932c24caab852ae9de15f94605cc350c6
auth_required: true
build_id: '286'
build_number: '286'
feature_groups:
- mirantis
fuel-agent_sha: 082a47bf014002e515001be05f99040437281a2d
fuel-library_sha: ff63a0bbc93a3a0fb78215c2fd0c77add8dfe589
fuel-nailgun-agent_sha: d7027952870a35db8dc52f185bb1158cdd3d1ebd
fuel-ostf_sha: 1f08e6e71021179b9881a824d9c999957fcc7045
fuelmain_sha: 9ab01caf960013dc882825dc9b0e11ccf0b81cb0
nailgun_sha: 5c33995a2e6d9b1b8cdddfa2630689da5084506f
openstack_version: 2015.1.0-7.0
production: docker
python-fuelclient_sha: 1ce8ecd8beb640f2f62f73435f4e18d1469979ac
release: '7.0'
release_versions:
  2015.1.0-7.0:
    VERSION:
      api: '1.0'
      astute_sha: 8283dc2932c24caab852ae9de15f94605cc350c6
      build_id: '286'
      build_number: '286'
      feature_groups:
      - mirantis
      fuel-agent_sha: 082a47bf014002e515001be05f99040437281a2d
      fuel-library_sha: ff63a0bbc93a3a0fb78215c2fd0c77add8dfe589
      fuel-nailgun-agent_sha: d7027952870a35db8dc52f185bb1158cdd3d1ebd
      fuel-ostf_sha: 1f08e6e71021179b9881a824d9c999957fcc7045
      fuelmain_sha: 9ab01caf960013dc882825dc9b0e11ccf0b81cb0
      nailgun_sha: 5c33995a2e6d9b1b8cdddfa2630689da5084506f
      openstack_version: 2015.1.0-7.0
      production: docker
      python-fuelclient_sha: 1ce8ecd8beb640f2f62f73435f4e18d1469979ac
      release: '7.0'

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/221390

[OpenStack Infra (hudson-openstack)]

Change abandoned by Alexander Adamov (<email address hidden>) on branch: master
Review: https://review.openstack.org/221390