update examples

This commit is contained in:
Vladimir Kuklin 2013-08-02 21:44:32 +04:00 committed by Evgeniy L
parent 62edc2adff
commit 21f045543c
5 changed files with 325 additions and 319 deletions

View File

@ -117,7 +117,7 @@ nodes.each do |node,macaddr|
result['ks_meta'] = result['ks_meta'].update(cobbler_ks_meta)
puppet_network_data = [
{"name" => 'public', 'ip'=>ip, "dev" => public_iface, 'netmask' => "255.255.255.0", "gateway" => default_gateway },
{"name" => ['management','storage'], 'ip'=>"#{internal_net_prefix.to_s}.#{l_octet}", "dev" => public_iface, 'netmask' => "255.255.255.0"},
{"name" => ['management','storage'], 'ip'=>"#{internal_net_prefix.to_s}.#{l_octet}", "dev" => internal_iface, 'netmask' => "255.255.255.0"},
{"name" => 'fixed', "dev" => private_iface},
]
result['network_data'] = puppet_network_data
@ -125,6 +125,7 @@ nodes.each do |node,macaddr|
newyaml['nodes'].push(result)
end
newyaml['attributes']['master_ip'] = master_ip
newyaml['attributes']['dns_nameservers'] = master_ip
newyaml['attributes']['libvirt_type'] = 'kvm'
newyaml['attributes']['public_vip'] = '172.18.94.46'

View File

@ -112,7 +112,7 @@ nodes.each do |node,macaddr|
result['ks_meta'] = result['ks_meta'].update(cobbler_ks_meta)
puppet_network_data = [
{"name" => 'public', 'ip'=>ip, "dev" => public_iface, 'netmask' => "255.255.255.0", "gateway" => default_gateway },
{"name" => ['management','storage'], 'ip'=>"#{internal_net_prefix.to_s}.#{l_octet}", "dev" => public_iface, 'netmask' => "255.255.255.0"},
{"name" => ['management','storage'], 'ip'=>"#{internal_net_prefix.to_s}.#{l_octet}", "dev" => internal_iface, 'netmask' => "255.255.255.0"},
{"name" => 'fixed', "dev" => private_iface},
]
result['network_data'] = puppet_network_data
@ -120,6 +120,7 @@ nodes.each do |node,macaddr|
newyaml['nodes'].push(result)
end
newyaml['attributes']['master_ip'] = master_ip
newyaml['attributes']['dns_nameservers'] = master_ip
newyaml['attributes']['libvirt_type'] = 'kvm'
newyaml['attributes']['floating_network_range'] = '10.20.0.150/28'

View File

@ -210,7 +210,7 @@ node_01: &node_01
onboot: 'yes'
peerdns: 'no'
# == meta
# Strange shit needed for log parsing during astute jobs.
# Outdated stuff needed for log parsing during astute jobs.
meta:
memory:
total: 778694656
@ -267,6 +267,9 @@ nodes:
#Openstack cluster attributes used during deployment.
attributes:
# == master_ip
# IP of puppet master.
master_ip: 10.20.0.2
# == use_cow_images:
# Whether to use cow images
use_cow_images: true

View File

@ -82,93 +82,7 @@
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 6,
"manufacturer": "KVM"
},
{
"status": "discover",
"name": "Untitled (D2:66)",
"ip": "172.18.94.39",
"error_type": null,
"pending_addition": false,
"fqdn": null,
"network_data": [],
"platform_name": null,
"cluster": null,
"mac": "64:C3:54:54:D2:66",
"meta": {
"memory": {
"slots": 1,
"total": 2147483648,
"maximum_capacity": 2147483648,
"devices": [
{
"type": "RAM",
"size": 2147483648
}
]
},
"interfaces": [
{
"mac": "64:86:89:DC:11:DF",
"max_speed": null,
"name": "eth2",
"current_speed": null
},
{
"mac": "64:3E:31:66:CA:AF",
"max_speed": null,
"name": "eth1",
"current_speed": null
},
{
"name": "eth0",
"ip": "172.18.94.39",
"netmask": "255.255.255.224",
"mac": "64:C3:54:54:D2:66",
"max_speed": null,
"current_speed": null
}
],
"disks": [
{
"model": null,
"disk": "disk/by-path/pci-0000:00:07.0-virtio-pci-virtio4",
"name": "vdb",
"size": 21474836480
},
{
"model": null,
"disk": "disk/by-path/pci-0000:00:06.0-virtio-pci-virtio3",
"name": "vda",
"size": 21474836480
}
],
"system": {
"fqdn": "bootstrap",
"manufacturer": "KVM"
},
"cpu": {
"real": 0,
"total": 2,
"spec": [
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
},
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
}
]
}
},
"role": null,
"online": true,
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 1,
"id": 7,
"manufacturer": "KVM"
},
{
@ -254,7 +168,93 @@
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 4,
"id": 6,
"manufacturer": "KVM"
},
{
"status": "discover",
"name": "Untitled (B2:DC)",
"ip": "172.18.94.45",
"error_type": null,
"pending_addition": false,
"fqdn": null,
"network_data": [],
"platform_name": null,
"cluster": null,
"mac": "64:97:93:5F:B2:DC",
"meta": {
"memory": {
"slots": 1,
"total": 1073741824,
"maximum_capacity": 1073741824,
"devices": [
{
"type": "RAM",
"size": 1073741824
}
]
},
"interfaces": [
{
"mac": "64:E1:22:FF:4D:64",
"max_speed": null,
"name": "eth2",
"current_speed": null
},
{
"mac": "64:FC:F2:3C:CA:5D",
"max_speed": null,
"name": "eth1",
"current_speed": null
},
{
"name": "eth0",
"ip": "172.18.94.45",
"netmask": "255.255.255.224",
"mac": "64:97:93:5F:B2:DC",
"max_speed": null,
"current_speed": null
}
],
"disks": [
{
"model": null,
"disk": "disk/by-path/pci-0000:00:07.0-virtio-pci-virtio4",
"name": "vdb",
"size": 21474836480
},
{
"model": null,
"disk": "disk/by-path/pci-0000:00:06.0-virtio-pci-virtio3",
"name": "vda",
"size": 21474836480
}
],
"system": {
"fqdn": "bootstrap",
"manufacturer": "KVM"
},
"cpu": {
"real": 0,
"total": 2,
"spec": [
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
},
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
}
]
}
},
"role": null,
"online": true,
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 5,
"manufacturer": "KVM"
},
{
@ -340,179 +340,7 @@
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 7,
"manufacturer": "KVM"
},
{
"status": "discover",
"name": "Untitled (79:39)",
"ip": "172.18.94.44",
"error_type": null,
"pending_addition": false,
"fqdn": null,
"network_data": [],
"platform_name": null,
"cluster": null,
"mac": "64:EA:DF:59:79:39",
"meta": {
"memory": {
"slots": 1,
"total": 1073741824,
"maximum_capacity": 1073741824,
"devices": [
{
"type": "RAM",
"size": 1073741824
}
]
},
"interfaces": [
{
"mac": "64:E9:9A:4D:04:3F",
"max_speed": null,
"name": "eth2",
"current_speed": null
},
{
"mac": "64:B9:CE:28:0D:0E",
"max_speed": null,
"name": "eth1",
"current_speed": null
},
{
"name": "eth0",
"ip": "172.18.94.44",
"netmask": "255.255.255.224",
"mac": "64:EA:DF:59:79:39",
"max_speed": null,
"current_speed": null
}
],
"disks": [
{
"model": null,
"disk": "disk/by-path/pci-0000:00:07.0-virtio-pci-virtio4",
"name": "vdb",
"size": 21474836480
},
{
"model": null,
"disk": "disk/by-path/pci-0000:00:06.0-virtio-pci-virtio3",
"name": "vda",
"size": 21474836480
}
],
"system": {
"fqdn": "bootstrap",
"manufacturer": "KVM"
},
"cpu": {
"real": 0,
"total": 2,
"spec": [
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
},
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
}
]
}
},
"role": null,
"online": true,
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 9,
"manufacturer": "KVM"
},
{
"status": "discover",
"name": "Untitled (1D:C9)",
"ip": "172.18.94.42",
"error_type": null,
"pending_addition": false,
"fqdn": null,
"network_data": [],
"platform_name": null,
"cluster": null,
"mac": "64:B7:37:B1:1D:C9",
"meta": {
"memory": {
"slots": 1,
"total": 1073741824,
"maximum_capacity": 1073741824,
"devices": [
{
"type": "RAM",
"size": 1073741824
}
]
},
"interfaces": [
{
"mac": "64:49:B1:F5:AA:CF",
"max_speed": null,
"name": "eth2",
"current_speed": null
},
{
"mac": "64:B3:BC:6D:17:A0",
"max_speed": null,
"name": "eth1",
"current_speed": null
},
{
"name": "eth0",
"ip": "172.18.94.42",
"netmask": "255.255.255.224",
"mac": "64:B7:37:B1:1D:C9",
"max_speed": null,
"current_speed": null
}
],
"disks": [
{
"model": null,
"disk": "disk/by-path/pci-0000:00:07.0-virtio-pci-virtio4",
"name": "vdb",
"size": 21474836480
},
{
"model": null,
"disk": "disk/by-path/pci-0000:00:06.0-virtio-pci-virtio3",
"name": "vda",
"size": 21474836480
}
],
"system": {
"fqdn": "bootstrap",
"manufacturer": "KVM"
},
"cpu": {
"real": 0,
"total": 2,
"spec": [
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
},
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
}
]
}
},
"role": null,
"online": true,
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 3,
"id": 4,
"manufacturer": "KVM"
},
{
@ -684,20 +512,20 @@
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 5,
"id": 8,
"manufacturer": "KVM"
},
{
"status": "discover",
"name": "Untitled (B2:DC)",
"ip": "172.18.94.45",
"name": "Untitled (79:39)",
"ip": "172.18.94.44",
"error_type": null,
"pending_addition": false,
"fqdn": null,
"network_data": [],
"platform_name": null,
"cluster": null,
"mac": "64:97:93:5F:B2:DC",
"mac": "64:EA:DF:59:79:39",
"meta": {
"memory": {
"slots": 1,
@ -712,22 +540,22 @@
},
"interfaces": [
{
"mac": "64:E1:22:FF:4D:64",
"mac": "64:E9:9A:4D:04:3F",
"max_speed": null,
"name": "eth2",
"current_speed": null
},
{
"mac": "64:FC:F2:3C:CA:5D",
"mac": "64:B9:CE:28:0D:0E",
"max_speed": null,
"name": "eth1",
"current_speed": null
},
{
"name": "eth0",
"ip": "172.18.94.45",
"ip": "172.18.94.44",
"netmask": "255.255.255.224",
"mac": "64:97:93:5F:B2:DC",
"mac": "64:EA:DF:59:79:39",
"max_speed": null,
"current_speed": null
}
@ -770,7 +598,179 @@
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 8,
"id": 9,
"manufacturer": "KVM"
},
{
"status": "discover",
"name": "Untitled (D2:66)",
"ip": "172.18.94.39",
"error_type": null,
"pending_addition": false,
"fqdn": null,
"network_data": [],
"platform_name": null,
"cluster": null,
"mac": "64:C3:54:54:D2:66",
"meta": {
"memory": {
"slots": 1,
"total": 2147483648,
"maximum_capacity": 2147483648,
"devices": [
{
"type": "RAM",
"size": 2147483648
}
]
},
"interfaces": [
{
"mac": "64:86:89:DC:11:DF",
"max_speed": null,
"name": "eth2",
"current_speed": null
},
{
"mac": "64:3E:31:66:CA:AF",
"max_speed": null,
"name": "eth1",
"current_speed": null
},
{
"name": "eth0",
"ip": "172.18.94.39",
"netmask": "255.255.255.224",
"mac": "64:C3:54:54:D2:66",
"max_speed": null,
"current_speed": null
}
],
"disks": [
{
"model": null,
"disk": "disk/by-path/pci-0000:00:07.0-virtio-pci-virtio4",
"name": "vdb",
"size": 21474836480
},
{
"model": null,
"disk": "disk/by-path/pci-0000:00:06.0-virtio-pci-virtio3",
"name": "vda",
"size": 21474836480
}
],
"system": {
"fqdn": "bootstrap",
"manufacturer": "KVM"
},
"cpu": {
"real": 0,
"total": 2,
"spec": [
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
},
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
}
]
}
},
"role": null,
"online": true,
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 1,
"manufacturer": "KVM"
},
{
"status": "discover",
"name": "Untitled (1D:C9)",
"ip": "172.18.94.42",
"error_type": null,
"pending_addition": false,
"fqdn": null,
"network_data": [],
"platform_name": null,
"cluster": null,
"mac": "64:B7:37:B1:1D:C9",
"meta": {
"memory": {
"slots": 1,
"total": 1073741824,
"maximum_capacity": 1073741824,
"devices": [
{
"type": "RAM",
"size": 1073741824
}
]
},
"interfaces": [
{
"mac": "64:49:B1:F5:AA:CF",
"max_speed": null,
"name": "eth2",
"current_speed": null
},
{
"mac": "64:B3:BC:6D:17:A0",
"max_speed": null,
"name": "eth1",
"current_speed": null
},
{
"name": "eth0",
"ip": "172.18.94.42",
"netmask": "255.255.255.224",
"mac": "64:B7:37:B1:1D:C9",
"max_speed": null,
"current_speed": null
}
],
"disks": [
{
"model": null,
"disk": "disk/by-path/pci-0000:00:07.0-virtio-pci-virtio4",
"name": "vdb",
"size": 21474836480
},
{
"model": null,
"disk": "disk/by-path/pci-0000:00:06.0-virtio-pci-virtio3",
"name": "vda",
"size": 21474836480
}
],
"system": {
"fqdn": "bootstrap",
"manufacturer": "KVM"
},
"cpu": {
"real": 0,
"total": 2,
"spec": [
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
},
{
"model": "QEMU Virtual CPU version 1.2.0",
"frequency": 1999
}
]
}
},
"role": null,
"online": true,
"progress": 0,
"pending_deletion": false,
"os_platform": "centos",
"id": 3,
"manufacturer": "KVM"
}
]

View File

@ -11,15 +11,15 @@ nodes:
- management
- storage
ip: 10.107.2.39
dev: eth0
dev: eth1
netmask: 255.255.255.0
- name: fixed
dev: eth2
public_br: br-ex
internal_br: br-mgmt
id: 1
id: '1'
default_gateway: 172.18.94.33
uid: 1
uid: '1'
mac: 64:C3:54:54:D2:66
name: compute-01
ip: 172.18.94.39
@ -32,7 +32,7 @@ nodes:
netboot_enabled: '1'
name_servers: 172.18.94.34
puppet_master: fuel.domain.tld
ks_meta: &8640500
ks_meta: &18648020
ks_spaces: ! '"[{\"type\": \"disk\", \"id\": \"disk/by-path/pci-0000:00:06.0-virtio-pci-virtio3\",\"volumes\":
[{\"mount\": \"/boot\", \"type\": \"partition\", \"size\": 200}, {\"type\":
\"mbr\"}, {\"size\": 20275, \"type\": \"pv\", \"vg\": \"os\"}],\"size\": 19232},{\"type\":
@ -72,7 +72,7 @@ nodes:
eth2:
onboot: 'no'
peerdns: 'no'
meta: &8663000
meta: &18667760
memory:
total: 778694656
interfaces:
@ -131,15 +131,15 @@ nodes:
- management
- storage
ip: 10.107.2.41
dev: eth0
dev: eth1
netmask: 255.255.255.0
- name: fixed
dev: eth2
public_br: br-ex
internal_br: br-mgmt
id: 1
id: '2'
default_gateway: 172.18.94.33
uid: 1
uid: '2'
mac: 64:48:7A:14:83:E8
name: controller-01
ip: 172.18.94.41
@ -152,7 +152,7 @@ nodes:
netboot_enabled: '1'
name_servers: 172.18.94.34
puppet_master: fuel.domain.tld
ks_meta: *8640500
ks_meta: *18648020
interfaces:
eth0:
ip_address: 172.18.94.41
@ -170,7 +170,7 @@ nodes:
eth2:
onboot: 'no'
peerdns: 'no'
meta: *8663000
meta: *18667760
error_type:
- role: controller
network_data:
@ -183,15 +183,15 @@ nodes:
- management
- storage
ip: 10.107.2.42
dev: eth0
dev: eth1
netmask: 255.255.255.0
- name: fixed
dev: eth2
public_br: br-ex
internal_br: br-mgmt
id: 1
id: '3'
default_gateway: 172.18.94.33
uid: 1
uid: '3'
mac: 64:B7:37:B1:1D:C9
name: controller-02
ip: 172.18.94.42
@ -204,7 +204,7 @@ nodes:
netboot_enabled: '1'
name_servers: 172.18.94.34
puppet_master: fuel.domain.tld
ks_meta: *8640500
ks_meta: *18648020
interfaces:
eth0:
ip_address: 172.18.94.42
@ -222,7 +222,7 @@ nodes:
eth2:
onboot: 'no'
peerdns: 'no'
meta: *8663000
meta: *18667760
error_type:
- role: controller
network_data:
@ -235,15 +235,15 @@ nodes:
- management
- storage
ip: 10.107.2.36
dev: eth0
dev: eth1
netmask: 255.255.255.0
- name: fixed
dev: eth2
public_br: br-ex
internal_br: br-mgmt
id: 1
id: '4'
default_gateway: 172.18.94.33
uid: 1
uid: '4'
mac: 64:F4:64:E7:50:D3
name: controller-03
ip: 172.18.94.36
@ -256,7 +256,7 @@ nodes:
netboot_enabled: '1'
name_servers: 172.18.94.34
puppet_master: fuel.domain.tld
ks_meta: *8640500
ks_meta: *18648020
interfaces:
eth0:
ip_address: 172.18.94.36
@ -274,7 +274,7 @@ nodes:
eth2:
onboot: 'no'
peerdns: 'no'
meta: *8663000
meta: *18667760
error_type:
- role: storage
network_data:
@ -287,15 +287,15 @@ nodes:
- management
- storage
ip: 10.107.2.43
dev: eth0
dev: eth1
netmask: 255.255.255.0
- name: fixed
dev: eth2
public_br: br-ex
internal_br: br-mgmt
id: 1
id: '7'
default_gateway: 172.18.94.33
uid: 1
uid: '7'
mac: 64:57:26:83:1D:CA
name: swift-01
ip: 172.18.94.43
@ -308,7 +308,7 @@ nodes:
netboot_enabled: '1'
name_servers: 172.18.94.34
puppet_master: fuel.domain.tld
ks_meta: *8640500
ks_meta: *18648020
interfaces:
eth0:
ip_address: 172.18.94.43
@ -326,7 +326,7 @@ nodes:
eth2:
onboot: 'no'
peerdns: 'no'
meta: *8663000
meta: *18667760
error_type:
- role: storage
network_data:
@ -339,15 +339,15 @@ nodes:
- management
- storage
ip: 10.107.2.47
dev: eth0
dev: eth1
netmask: 255.255.255.0
- name: fixed
dev: eth2
public_br: br-ex
internal_br: br-mgmt
id: 1
id: '8'
default_gateway: 172.18.94.33
uid: 1
uid: '8'
mac: 64:DC:FD:AD:EB:4E
name: swift-02
ip: 172.18.94.47
@ -360,7 +360,7 @@ nodes:
netboot_enabled: '1'
name_servers: 172.18.94.34
puppet_master: fuel.domain.tld
ks_meta: *8640500
ks_meta: *18648020
interfaces:
eth0:
ip_address: 172.18.94.47
@ -378,7 +378,7 @@ nodes:
eth2:
onboot: 'no'
peerdns: 'no'
meta: *8663000
meta: *18667760
error_type:
- role: storage
network_data:
@ -391,15 +391,15 @@ nodes:
- management
- storage
ip: 10.107.2.44
dev: eth0
dev: eth1
netmask: 255.255.255.0
- name: fixed
dev: eth2
public_br: br-ex
internal_br: br-mgmt
id: 1
id: '9'
default_gateway: 172.18.94.33
uid: 1
uid: '9'
mac: 64:EA:DF:59:79:39
name: swift-03
ip: 172.18.94.44
@ -412,7 +412,7 @@ nodes:
netboot_enabled: '1'
name_servers: 172.18.94.34
puppet_master: fuel.domain.tld
ks_meta: *8640500
ks_meta: *18648020
interfaces:
eth0:
ip_address: 172.18.94.44
@ -430,7 +430,7 @@ nodes:
eth2:
onboot: 'no'
peerdns: 'no'
meta: *8663000
meta: *18667760
error_type:
- role: primary-swift-proxy
network_data:
@ -443,15 +443,15 @@ nodes:
- management
- storage
ip: 10.107.2.40
dev: eth0
dev: eth1
netmask: 255.255.255.0
- name: fixed
dev: eth2
public_br: br-ex
internal_br: br-mgmt
id: 1
id: '6'
default_gateway: 172.18.94.33
uid: 1
uid: '6'
mac: 64:BC:C3:9C:07:26
name: swiftproxy-01
ip: 172.18.94.40
@ -464,7 +464,7 @@ nodes:
netboot_enabled: '1'
name_servers: 172.18.94.34
puppet_master: fuel.domain.tld
ks_meta: *8640500
ks_meta: *18648020
interfaces:
eth0:
ip_address: 172.18.94.40
@ -482,7 +482,7 @@ nodes:
eth2:
onboot: 'no'
peerdns: 'no'
meta: *8663000
meta: *18667760
error_type:
- role: swift-proxy
network_data:
@ -495,15 +495,15 @@ nodes:
- management
- storage
ip: 10.107.2.45
dev: eth0
dev: eth1
netmask: 255.255.255.0
- name: fixed
dev: eth2
public_br: br-ex
internal_br: br-mgmt
id: 1
id: '5'
default_gateway: 172.18.94.33
uid: 1
uid: '5'
mac: 64:97:93:5F:B2:DC
name: swiftproxy-02
ip: 172.18.94.45
@ -516,7 +516,7 @@ nodes:
netboot_enabled: '1'
name_servers: 172.18.94.34
puppet_master: fuel.domain.tld
ks_meta: *8640500
ks_meta: *18648020
interfaces:
eth0:
ip_address: 172.18.94.45
@ -534,9 +534,10 @@ nodes:
eth2:
onboot: 'no'
peerdns: 'no'
meta: *8663000
meta: *18667760
error_type:
attributes:
master_ip: 172.18.94.34
use_cow_images: true
libvirt_type: kvm
dns_nameservers: 172.18.94.34
@ -604,7 +605,7 @@ attributes:
ntp_servers:
- pool.ntp.org
deployment_id: 1
deployment_mode: ha
deployment_mode: ha_full
deployment_source: cli
deployment_engine: nailyfact
engine: