openstack/fuel-library
Code Issues Proposed changes

Merge "Remove temporary workaround for VIP names and format"

Browse Source
This commit is contained in:
Jenkins 2015-07-30 13:01:33 +00:00 committed by Gerrit Code Review
commit 1ffee9509f
19 changed files with 160 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
deployment/puppet/osnailyfacter/modular/globals/globals.pp
View File

@ -108,39 +108,19 @@ $public_address = get_network_role_property('ex', 'ipaddr')
$public_netmask = get_network_role_property('ex', 'netmask')
$storage_address = get_network_role_property('storage', 'ipaddr')
$storage_netmask = get_network_role_property('storage', 'netmask')
#todo(sv): It's a workaround. After merge some part to Nailgun and change CI ISO we should use just $network_metadata['vips']['VIP_NAME']['ipaddr']
#todo(sv): Also some VIPs was renamed
if is_hash($network_metadata['vips']['public']) {
$public_vip = $network_metadata['vips']['public']['ipaddr']
} else {
$public_vip = $network_metadata['vips']['public_vip']
$public_vip = $network_metadata['vips']['public']['ipaddr']
$management_vip = $network_metadata['vips']['management']['ipaddr']
$public_vrouter_vip = $network_metadata['vips']['vrouter_pub']['ipaddr']
$management_vrouter_vip = $network_metadata['vips']['vrouter']['ipaddr']
$database_vip = is_hash($network_metadata['vips']['database']) ? {
true => pick($network_metadata['vips']['database']['ipaddr'], $management_vip),
default => $management_vip
}
if is_hash($network_metadata['vips']['management']) {
$management_vip = $network_metadata['vips']['management']['ipaddr']
} else {
$management_vip = $network_metadata['vips']['management_vip']
$service_endpoint = is_hash($network_metadata['vips']['service_endpoint']) ? {
true => pick($network_metadata['vips']['service_endpoint']['ipaddr'], $management_vip),
default => $management_vip
}
if is_hash($network_metadata['vips']['database']) {
$database_vip = $network_metadata['vips']['database']['ipaddr']
} else {
$database_vip = pick($network_metadata['vips']['database'], $management_vip)
}
if is_hash($network_metadata['vips']['vrouter_pub']) {
$public_vrouter_vip = $network_metadata['vips']['vrouter_pub']['ipaddr']
} else {
$public_vrouter_vip = $network_metadata['vips']['public_vrouter_vip']
}
if is_hash($network_metadata['vips']['vrouter']) {
$management_vrouter_vip = $network_metadata['vips']['vrouter']['ipaddr']
} else {
$management_vrouter_vip = $network_metadata['vips']['management_vrouter_vip']
}
if is_hash($network_metadata['vips']['service_endpoint']) {
$service_endpoint = $network_metadata['vips']['service_endpoint']['ipaddr']
} else {
$service_endpoint = pick($network_metadata['vips']['service_endpoint'], $management_vip)
}
#todo(sv): end of workaround
if $use_neutron {
$novanetwork_params = {}

12
tests/noop/astute.yaml/neut_gre.generate_vms.yaml
View File

@ -327,10 +327,14 @@ network_metadata:
- compute
name: node-132
vips:
management_vrouter_vip: 192.168.0.3
management_vip: 192.168.0.2
public_vip: 10.109.1.2
public_vrouter_vip: 10.109.1.3
vrouter:
ipaddr: 192.168.0.3
management:
ipaddr: 192.168.0.2
public:
ipaddr: 10.109.1.2
vrouter_pub:
ipaddr: 10.109.1.3
network_scheme:
endpoints:
br-ex:

12
tests/noop/astute.yaml/neut_gre.murano.sahara-cinder.yaml
View File

@ -329,10 +329,14 @@ network_metadata:
- compute
name: node-132
vips:
management_vrouter_vip: 192.168.0.3
management_vip: 192.168.0.2
public_vip: 10.109.1.2
public_vrouter_vip: 10.109.1.3
vrouter:
ipaddr: 192.168.0.3
management:
ipaddr: 192.168.0.2
public:
ipaddr: 10.109.1.2
vrouter_pub:
ipaddr: 10.109.1.3
network_scheme:
endpoints:
br-fw-admin:

12
tests/noop/astute.yaml/neut_gre.murano.sahara-compute.yaml
View File

@ -329,10 +329,14 @@ network_metadata:
- compute
name: node-132
vips:
management_vrouter_vip: 192.168.0.3
management_vip: 192.168.0.2
public_vip: 10.109.1.2
public_vrouter_vip: 10.109.1.3
vrouter:
ipaddr: 192.168.0.3
management:
ipaddr: 192.168.0.2
public:
ipaddr: 10.109.1.2
vrouter_pub:
ipaddr: 10.109.1.3
network_scheme:
endpoints:
br-fw-admin:

12
tests/noop/astute.yaml/neut_gre.murano.sahara-controller.yaml
View File

@ -329,10 +329,14 @@ network_metadata:
- compute
name: node-132
vips:
management_vrouter_vip: 192.168.0.3
management_vip: 192.168.0.2
public_vip: 10.109.1.2
public_vrouter_vip: 10.109.1.3
vrouter:
ipaddr: 192.168.0.3
management:
ipaddr: 192.168.0.2
public:
ipaddr: 10.109.1.2
vrouter_pub:
ipaddr: 10.109.1.3
network_scheme:
endpoints:
br-ex:

12
tests/noop/astute.yaml/neut_gre.murano.sahara-primary-controller.yaml
View File

@ -329,10 +329,14 @@ network_metadata:
- compute
name: node-132
vips:
management_vrouter_vip: 192.168.0.3
management_vip: 192.168.0.2
public_vip: 10.109.1.2
public_vrouter_vip: 10.109.1.3
vrouter:
ipaddr: 192.168.0.3
management:
ipaddr: 192.168.0.2
public:
ipaddr: 10.109.1.2
vrouter_pub:
ipaddr: 10.109.1.3
network_scheme:
endpoints:
br-ex:

12
tests/noop/astute.yaml/neut_vlan.ceph.ceil-ceph-osd.yaml
View File

@ -329,10 +329,14 @@ network_metadata:
- compute
name: node-127
vips:
management_vrouter_vip: 192.168.0.6
management_vip: 192.168.0.7
public_vip: 172.16.0.3
public_vrouter_vip: 172.16.0.3
vrouter:
ipaddr: 192.168.0.6
management:
ipaddr: 192.168.0.7
public:
ipaddr: 172.16.0.3
vrouter_pub:
ipaddr: 172.16.0.3
network_scheme:
endpoints:
br-fw-admin:

12
tests/noop/astute.yaml/neut_vlan.ceph.ceil-compute.yaml
View File

@ -329,10 +329,14 @@ network_metadata:
- compute
name: node-127
vips:
management_vrouter_vip: 192.168.0.6
management_vip: 192.168.0.7
public_vip: 172.16.0.3
public_vrouter_vip: 172.16.0.3
vrouter:
ipaddr: 192.168.0.6
management:
ipaddr: 192.168.0.7
public:
ipaddr: 172.16.0.3
vrouter_pub:
ipaddr: 172.16.0.3
network_scheme:
endpoints:
br-fw-admin:

12
tests/noop/astute.yaml/neut_vlan.ceph.ceil-primary-controller.yaml
View File

@ -329,10 +329,14 @@ network_metadata:
- compute
name: node-127
vips:
management_vrouter_vip: 192.168.0.6
management_vip: 192.168.0.7
public_vip: 172.16.0.3
public_vrouter_vip: 172.16.0.3
vrouter:
ipaddr: 192.168.0.6
management:
ipaddr: 192.168.0.7
public:
ipaddr: 172.16.0.3
vrouter_pub:
ipaddr: 172.16.0.3
network_scheme:
endpoints:
br-ex:

12
tests/noop/astute.yaml/neut_vlan.ceph.ceil-primary-mongo.yaml
View File

@ -329,10 +329,14 @@ network_metadata:
- compute
name: node-127
vips:
management_vrouter_vip: 192.168.0.6
management_vip: 192.168.0.7
public_vip: 172.16.0.3
public_vrouter_vip: 172.16.0.3
vrouter:
ipaddr: 192.168.0.6
management:
ipaddr: 192.168.0.7
public:
ipaddr: 172.16.0.3
vrouter_pub:
ipaddr: 172.16.0.3
network_scheme:
endpoints:
br-fw-admin:

12
tests/noop/astute.yaml/novanet-compute.yaml
View File

@ -294,10 +294,14 @@ network_metadata:
- primary-controller
name: node-137
vips:
management_vrouter_vip: 192.168.0.6
management_vip: 192.168.0.5
public_vip: 172.16.0.6
public_vrouter_vip: 172.16.0.7
vrouter:
ipaddr: 192.168.0.6
management:
ipaddr: 192.168.0.5
public:
ipaddr: 172.16.0.6
vrouter_pub:
ipaddr: 172.16.0.7
network_scheme:
endpoints:
br-ex:

12
tests/noop/astute.yaml/novanet-primary-controller.yaml
View File

@ -294,10 +294,14 @@ network_metadata:
- primary-controller
name: node-137
vips:
management_vrouter_vip: 192.168.0.6
management_vip: 192.168.0.5
public_vip: 172.16.0.6
public_vrouter_vip: 172.16.0.7
vrouter:
ipaddr: 192.168.0.6
management:
ipaddr: 192.168.0.5
public:
ipaddr: 172.16.0.6
vrouter_pub:
ipaddr: 172.16.0.7
network_scheme:
endpoints:
br-ex:

12
tests/noop/astute.yaml/novanet-zabbix-server.yaml
View File

@ -294,10 +294,14 @@ network_metadata:
- primary-controller
name: node-137
vips:
management_vrouter_vip: 192.168.0.6
management_vip: 192.168.0.5
public_vip: 172.16.0.6
public_vrouter_vip: 172.16.0.7
vrouter:
ipaddr: 192.168.0.6
management:
ipaddr: 192.168.0.5
public:
ipaddr: 172.16.0.6
vrouter_pub:
ipaddr: 172.16.0.7
network_scheme:
endpoints:
br-ex:

14
tests/noop/astute.yaml/novanet_flat.cinder-vmware.vcenter.yaml
View File

@ -789,10 +789,14 @@ network_metadata:
- mongo
name: node-6
vips:
management_vrouter_vip: 10.108.2.3
management_vip: 10.108.2.2
public_vip: 10.108.1.2
public_vrouter_vip: 10.108.1.3
vrouter:
ipaddr: 10.108.2.3
management:
ipaddr: 10.108.2.2
public:
ipaddr: 10.108.1.2
vrouter_pub:
ipaddr: 10.108.1.3
network_scheme:
transformations:
- action: add-br
@ -974,4 +978,4 @@ cinder:
user_password: 0Q8lKhCc
fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
deployment_id: 1
openstack_version_prev:
openstack_version_prev:

14
tests/noop/astute.yaml/novanet_flat.controller.platforms.yaml
View File

@ -799,10 +799,14 @@ network_metadata:
- mongo
name: node-6
vips:
management_vrouter_vip: 10.108.2.3
management_vip: 10.108.2.2
public_vip: 10.108.1.2
public_vrouter_vip: 10.108.1.3
vrouter:
ipaddr: 10.108.2.3
management:
ipaddr: 10.108.2.2
public:
ipaddr: 10.108.1.2
vrouter_pub:
ipaddr: 10.108.1.3
network_scheme:
transformations:
- action: add-br
@ -984,4 +988,4 @@ cinder:
user_password: 0Q8lKhCc
fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
deployment_id: 1
openstack_version_prev:
openstack_version_prev:

14
tests/noop/astute.yaml/novanet_flat.mongo.platforms.yaml
View File

@ -799,10 +799,14 @@ network_metadata:
- mongo
name: node-6
vips:
management_vrouter_vip: 10.108.2.3
management_vip: 10.108.2.2
public_vip: 10.108.1.2
public_vrouter_vip: 10.108.1.3
vrouter:
ipaddr: 10.108.2.3
management:
ipaddr: 10.108.2.2
public:
ipaddr: 10.108.1.2
vrouter_pub:
ipaddr: 10.108.1.3
network_scheme:
transformations:
- action: add-br
@ -984,4 +988,4 @@ cinder:
user_password: 0Q8lKhCc
fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
deployment_id: 1
openstack_version_prev:
openstack_version_prev:

12
tests/noop/astute.yaml/novanet_flat.primary-controller.platforms.yaml
View File

@ -799,10 +799,14 @@ network_metadata:
- mongo
name: node-6
vips:
management_vrouter_vip: 10.108.2.3
management_vip: 10.108.2.2
public_vip: 10.108.1.2
public_vrouter_vip: 10.108.1.3
vrouter:
ipaddr: 10.108.2.3
management:
ipaddr: 10.108.2.2
public:
ipaddr: 10.108.1.2
vrouter_pub:
ipaddr: 10.108.1.3
network_scheme:
transformations:
- action: add-br

14
tests/noop/astute.yaml/novanet_flat.primary-controller.vcenter.yaml
View File

@ -788,10 +788,14 @@ network_metadata:
- mongo
name: node-6
vips:
management_vrouter_vip: 10.108.2.3
management_vip: 10.108.2.2
public_vip: 10.108.1.2
public_vrouter_vip: 10.108.1.3
vrouter:
ipaddr: 10.108.2.3
management:
ipaddr: 10.108.2.2
public:
ipaddr: 10.108.1.2
vrouter_pub:
ipaddr: 10.108.1.3
network_scheme:
transformations:
- action: add-br
@ -973,4 +977,4 @@ cinder:
user_password: 0Q8lKhCc
fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
deployment_id: 1
openstack_version_prev:
openstack_version_prev:

14
tests/noop/astute.yaml/novanet_flat.primary-mongo.platforms.yaml
View File

@ -799,10 +799,14 @@ network_metadata:
- mongo
name: node-6
vips:
management_vrouter_vip: 10.108.2.3
management_vip: 10.108.2.2
public_vip: 10.108.1.2
public_vrouter_vip: 10.108.1.3
vrouter:
ipaddr: 10.108.2.3
management:
ipaddr: 10.108.2.2
public:
ipaddr: 10.108.1.2
vrouter_pub:
ipaddr: 10.108.1.3
network_scheme:
transformations:
- action: add-br
@ -984,4 +988,4 @@ cinder:
user_password: 0Q8lKhCc
fixed_key: fb64afea3f59f22d971956f8f773b93482fe3f6465067e5f5337c3e4391b172b
deployment_id: 1
openstack_version_prev:
openstack_version_prev: