Reflect Ubuntu+VLAN as preferred option

[Roman Alekseenkov]

For 6.0 GA, we would like to:

1) Make sure that "Ubuntu" is present as the first option in the dropdown, when users are selecting an OS. Ronen is claiming that 5.1 still has CentOS as a first option

2) Add "(default)" text to Ubuntu option in the dropdown

3) Add "(default)" text to VLAN option in the network selection radio box

This will be a clear indication of the fact Ubuntu+VLAN is a preferred configuration

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/6.0
Review: https://review.openstack.org/142154

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Change abandoned by Alexandra Morozova (<email address hidden>) on branch: master
Review: https://review.openstack.org/142155

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/142155
Committed: https://git.openstack.org/cgit/stackforge/fuel-web/commit/?id=17575b3ff34837a32081767e431fe215fd767436
Submitter: Jenkins
Branch: master

commit 17575b3ff34837a32081767e431fe215fd767436
Author: Alexandra Morozova <email address hidden>
Date: Tue Dec 16 17:29:11 2014 +0100

    Ubuntu release has now (default) string and VLAN is default network

    Closes-bug: #1403108

    Change-Id: I90ea02135ca4df890e8e84b0f7f238da02c32d8a

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/142154
Committed: https://git.openstack.org/cgit/stackforge/fuel-web/commit/?id=cdaa9389ac986f254d6ecb41c42c668e78bfc668
Submitter: Jenkins
Branch: stable/6.0

commit cdaa9389ac986f254d6ecb41c42c668e78bfc668
Author: Alexandra Morozova <email address hidden>
Date: Tue Dec 16 17:29:11 2014 +0100

    Ubuntu release has now (default) string and VLAN is default network

    Closes-bug: #1403108

    Change-Id: I90ea02135ca4df890e8e84b0f7f238da02c32d8a

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/6.0
Review: https://review.openstack.org/142164

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/142163
Committed: https://git.openstack.org/cgit/stackforge/fuel-web/commit/?id=7bfb8525ee2c72ef72889faa539d9b677197285c
Submitter: Jenkins
Branch: master

commit 7bfb8525ee2c72ef72889faa539d9b677197285c
Author: Alexandra Morozova <email address hidden>
Date: Tue Dec 16 18:15:52 2014 +0100

    Fix vlan label - added `(default)`

    Closes-bug: #1403108

    Change-Id: I9f88345329aae9d81fb853acf74dfa4de7668a57

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/142164
Committed: https://git.openstack.org/cgit/stackforge/fuel-web/commit/?id=dc621c96e30f0dd284998e975f3b800afe9fc082
Submitter: Jenkins
Branch: stable/6.0

commit dc621c96e30f0dd284998e975f3b800afe9fc082
Author: Alexandra Morozova <email address hidden>
Date: Tue Dec 16 18:15:52 2014 +0100

    Fix vlan label - added `(default)`

    Closes-bug: #1403108

    Change-Id: I9f88345329aae9d81fb853acf74dfa4de7668a57

[Andrey Sledzinskiy (asledzinskiy)]

verified on {

    "build_id": "2014-12-26_14-25-46",
    "ostf_sha": "a9afb68710d809570460c29d6c3293219d3624d4",
    "build_number": "58",
    "auth_required": true,
    "api": "1.0",
    "nailgun_sha": "5f91157daa6798ff522ca9f6d34e7e135f150a90",
    "production": "docker",
    "fuelmain_sha": "81d38d6f2903b5a8b4bee79ca45a54b76c1361b8",
    "astute_sha": "16b252d93be6aaa73030b8100cf8c5ca6a970a91",
    "feature_groups": [
        "mirantis"
    ],
    "release": "6.0",
    "release_versions": {
        "2014.2-6.0": {
            "VERSION": {
                "build_id": "2014-12-26_14-25-46",
                "ostf_sha": "a9afb68710d809570460c29d6c3293219d3624d4",
                "build_number": "58",
                "api": "1.0",
                "nailgun_sha": "5f91157daa6798ff522ca9f6d34e7e135f150a90",
                "production": "docker",
                "fuelmain_sha": "81d38d6f2903b5a8b4bee79ca45a54b76c1361b8",
                "astute_sha": "16b252d93be6aaa73030b8100cf8c5ca6a970a91",
                "feature_groups": [
                    "mirantis"
                ],
                "release": "6.0",
                "fuellib_sha": "fde8ba5e11a1acaf819d402c645c731af450aff0"
            }
        }
    },
    "fuellib_sha": "fde8ba5e11a1acaf819d402c645c731af450aff0"

}

[Anastasia Palkina (apalkina)]

Verified on ISO #58

"build_id": "2015-01-13_21-50-03", "ostf_sha": "0c1b663c6fc02ad972f2ed9ff6b000e7be1ea207", "build_number": "58", "auth_required": true, "api": "1.0", "nailgun_sha": "6fa6147384b533fb3d56cdc49ec6ecbcca47675d", "production": "docker", "fuelmain_sha": "", "astute_sha": "82125b0eef4e5a758fd4afa8917812e09a1f7dac", "feature_groups": ["mirantis"], "release": "6.1", "release_versions": {"2014.2-6.0": {"VERSION": {"build_id": "2015-01-13_21-50-03", "ostf_sha": "0c1b663c6fc02ad972f2ed9ff6b000e7be1ea207", "build_number": "58", "api": "1.0", "nailgun_sha": "6fa6147384b533fb3d56cdc49ec6ecbcca47675d", "production": "docker", "fuelmain_sha": "", "astute_sha": "82125b0eef4e5a758fd4afa8917812e09a1f7dac", "feature_groups": ["mirantis"], "release": "6.1", "fuellib_sha": "c53cb3a2bd5f99f32f78ed18e9472724fa6a9a9e"}}}, "fuellib_sha": "c53cb3a2bd5f99f32f78ed18e9472724fa6a9a9e"