Get rid of hardcoded "admin" tenant in puppet modules

[Anastasia Palkina]

If we change value 'tenant=admin' to 'adm' (for example) Horizon UI doesn't present networks (see screen). It means that new value for administrator's tenant name is not passed properly.

[Dmitry Pyzhov (dpyzhov)]

Is it possible to update manifests in order to accept custom tenant names?

[Ivan Kolodyazhny (e0ne)]

IMO, the better way is to fix it in manifests

[Mike Scherbakov (mihgen)]

Discussed with V.Kuklin, looks like it is bug in Fuel Library. Let's get rid of hardcoded "admin" tenant name in our manifests.

[Aleksey Zvyagintsev (azvyagintsev)]

Fixed
Files:

in fuel-library/
git diff create_predefined_networks_and_routers.rb
diff --git a/deployment/puppet/neutron/lib/puppet/parser/functions/create_predefined_networks_and_routers.rb b/deployment/puppet/neutron/lib/puppet/parser/functions/create_predefined_networks_and_routers.rb
index 44517fa..149b0de 100644
--- a/deployment/puppet/neutron/lib/puppet/parser/functions/create_predefined_networks_and_routers.rb
+++ b/deployment/puppet/neutron/lib/puppet/parser/functions/create_predefined_networks_and_routers.rb
@@ -83,6 +83,7 @@ class MrntNeutronNR
       # config network resources parameters
       network_config = get_default_network_config()
       network_config[:net][:name] = net.to_s
+ network_config[:net][:tenant] = ncfg[:tenant]
       network_config[:net][:network_type] = ncfg[:L2][:network_type]
       network_config[:net][:router_ext] = ncfg[:L2][:router_ext]
       network_config[:net][:shared] = ncfg[:shared]
==================================================================

in fuel-web/
diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py
index 9d2ad66..26cc472 100644
--- a/nailgun/nailgun/orchestrator/deployment_serializers.py
+++ b/nailgun/nailgun/orchestrator/deployment_serializers.py
@@ -623,7 +623,7 @@ class NeutronNetworkDeploymentSerializer(NetworkDeploymentSerializer):
             net_conf['L3']['enable_dhcp'] = enable_dhcp

             net_conf["L2"] = nets_l2_configs[net]
- net_conf['tenant'] = 'admin'
+ net_conf['tenant'] = cluster.attributes.editable['access']['tenant']['value']
             net_conf["shared"] = False

             attrs['predefined_networks'][net] = net_conf

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

[Anastasia Palkina (apalkina)]

"build_id": "2014-02-13_13-09-40",
"mirantis": "no",
"build_number": "116",
"nailgun_sha": "0653f2e052cad099686de0e8259d4b861577599e",
"ostf_sha": "f86abe5544b5ffcf621e0c450bca15737c92361f",
"fuelmain_sha": "a4f314699aa97a274513a5ee182b13d25bf137ed",
"astute_sha": "7eed50fc30cec675fff7787c37fcf6da6dd518ee",
"release": "4.1",
"fuellib_sha": "dc45bb0b8520a91a66fd0493a87b4cf4bd33c32c"

1. Create new environment (CentOS, simple mode)
2. Choose GRE segmentation
3. Add controller, compute, cinder nodes
4. Change username = "user", password = "password" and tenant = "adm"
5. Start deployment. It was successful
6. Login to Horizon
7. Try to create instance. UI doesn't present networks but networks is active (see screens)

[Aleksey Zvyagintsev (azvyagintsev)]

i have not seen patched files in release:

{"build_id": "2014-02-14_14-14-37", "mirantis": "no",.
"build_number": "122",
"nailgun_sha": "c00e635e9093a6cf9cfe559737aedadc8b7260a5",
"ostf_sha": "f86abe5544b5ffcf621e0c450bca15737c92361f",
"fuelmain_sha": "439577ed2795d86d57351d6e7cec6ed0049101c9",
"astute_sha": "7eed50fc30cec675fff7787c37fcf6da6dd518ee",
"release": "4.1",
"fuellib_sha": "ed8b7b8385b5726af43c5e57d6fba263bdc55c08"}

I made a mistake when commit? or it will be committed later?

[Matthew Mosesohn (raytrac3r)]

I see two problems here. We build neutron data with a hardcoded tenant=admin in nailgun provisioning serializer. That's wrong because we pass the same data in the access hash. We should remove the tenant info from neutron in 5.0 (due to time constraints), but simply fix deployment in 4.1 to use the tenant from the access hash in Fuel Library.

[Mike Scherbakov (mihgen)]

> to use the tenant from the access hash in Fuel Library.
let's do it please.

https://bugs.launchpad.net/fuel/+bug/1279834 is likely caused by this bug, and I suspect that it is not the only thing.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit dc5e6c2db4660ca31a146250b84c1d4dee73997d
Author: Matthew Mosesohn <email address hidden>
Date: Tue Feb 18 16:13:59 2014 +0400

    Implement user-defined tenant for neutron nets

    Default networks were previously hardcoded to use
    "admin" as the tenant, regardless of user input.
    This patch is a workaround because nailgun creates
    neutron_config with admin tenant hardcoded as well.

    FIXMEs were added to indicate what code needs cleanup
    after nailgun is patched.

    Change-Id: I272b53b6dbb4e972f94e82e81b58920351f4144d
    Partial-Bug: #1267431

[Mike Scherbakov (mihgen)]

This was reverted here: https://review.openstack.org/#/c/74823/
However I can't reproduce any issue with another tenant name. Instances are created and removed just fine, openrc file is updated with right tenant info.

[Matthew Mosesohn (raytrac3r)]

The issue was just with creating the default tenant networks in Neutron. If you deployed with nova network, you wouldn't see this problem.

[Matthew Mosesohn (raytrac3r)]

Since this patch was reverted (without any explanation in the commit), I'm moving this bug back to confirmed.

[Mike Scherbakov (mihgen)]

Yes, issue in Horizon with unavailable networks still exists, likely because of this. However OSTF passes fine.

[OpenStack Infra (hudson-openstack)]

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

[Matthew Mosesohn (raytrac3r)]

Need snapshot or method to reproduce

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/75837
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=8ce4358d14042172314a7221e85eaae332d1afea
Submitter: Jenkins
Branch: master

commit 8ce4358d14042172314a7221e85eaae332d1afea
Author: Matthew Mosesohn <email address hidden>
Date: Tue Feb 18 16:13:59 2014 +0400

    Implement user-defined tenant for neutron nets

    Default networks were previously hardcoded to use
    "admin" as the tenant, regardless of user input.
    This patch is a workaround because nailgun creates
    neutron_config with admin tenant hardcoded as well.

    FIXMEs were added to indicate what code needs cleanup
    after nailgun is patched.

    Change-Id: I272b53b6dbb4e972f94e82e81b58920351f4144d
    Partial-Bug: #1267431

    Fix spec test for sanitize neutron config

    Added access hash to config to match defaults
    for deployment

    Change-Id: Ib0ab5f2a532db824572f05c94673be48869fe731
    Related-Bug: 1267431

[Mike Scherbakov (mihgen)]

Let's open another bug to track better fix for this issue in 5.0.
User's problem should go away now with existing fix.

[Andrey Sledzinskiy (asledzinskiy)]

Verified on fuel_5_0_iso#21