Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "fuel: Enable 3rd party CI for fuel plugin onos"
[releng.git]
/
prototypes
/
puppet-infracloud
/
hiera
/
common.yaml
diff --git
a/prototypes/puppet-infracloud/hiera/common.yaml
b/prototypes/puppet-infracloud/hiera/common.yaml
index
5a758af
..
6096b9c
100644
(file)
--- a/
prototypes/puppet-infracloud/hiera/common.yaml
+++ b/
prototypes/puppet-infracloud/hiera/common.yaml
@@
-120,18
+120,18
@@
ipv4_nameserver: 8.8.8.8
ipv4_subnet_mask: 255.255.255.0
ipv4_gateway: 172.30.13.1
ironic_inventory:
ipv4_subnet_mask: 255.255.255.0
ipv4_gateway: 172.30.13.1
ironic_inventory:
- controller00
0
.opnfvlocal:
+ controller00.opnfvlocal:
driver: agent_ipmitool
driver_info:
power:
ipmi_address: 172.30.8.90
ipmi_username: admin
provisioning_ipv4_address: 10.20.0.130
driver: agent_ipmitool
driver_info:
power:
ipmi_address: 172.30.8.90
ipmi_username: admin
provisioning_ipv4_address: 10.20.0.130
- ipv4_address: 172.30.13.
66
- ansible_ssh_host: 172.30.13.
66
+ ipv4_address: 172.30.13.
90
+ ansible_ssh_host: 172.30.13.
90
ipv4_gateway: 172.30.13.1
ipv4_interface_mac: 00:1e:67:f9:9b:35
ipv4_gateway: 172.30.13.1
ipv4_interface_mac: 00:1e:67:f9:9b:35
- name: controller00
0
.opnfvlocal
+ name: controller00.opnfvlocal
nics:
- mac: a4:bf:01:01:a9:fc
- mac: 00:1e:67:f6:9b:35
nics:
- mac: a4:bf:01:01:a9:fc
- mac: 00:1e:67:f6:9b:35
@@
-141,18
+141,18
@@
ironic_inventory:
disk_size: '1800'
ram: '65536'
uuid: 00a22849-2442-e511-906e-0012795d96dd
disk_size: '1800'
ram: '65536'
uuid: 00a22849-2442-e511-906e-0012795d96dd
- compute00
0
.opnfvlocal:
+ compute00.opnfvlocal:
driver: agent_ipmitool
driver_info:
power:
ipmi_address: 172.30.8.91
ipmi_username: admin
provisioning_ipv4_address: 10.20.0.131
driver: agent_ipmitool
driver_info:
power:
ipmi_address: 172.30.8.91
ipmi_username: admin
provisioning_ipv4_address: 10.20.0.131
- ipv4_address: 172.30.13.
67
- ansible_ssh_host: 172.30.13.
67
+ ipv4_address: 172.30.13.
91
+ ansible_ssh_host: 172.30.13.
91
ipv4_gateway: 172.30.13.1
ipv4_subnet_mask: 255.255.255.0
ipv4_gateway: 172.30.13.1
ipv4_subnet_mask: 255.255.255.0
- name: compute00
0
.opnfvlocal
+ name: compute00.opnfvlocal
nics:
- mac: a4:bf:01:01:a9:d4
- mac: 00:1e:67:f6:9b:37
nics:
- mac: a4:bf:01:01:a9:d4
- mac: 00:1e:67:f6:9b:37
@@
-163,3
+163,8
@@
ironic_inventory:
ram: '65536'
uuid: 0051e926-f242-e511-906e-0012795d96dd
ipmi_passwords: {'172.30.8.90': 'octopus', '172.30.8.91': 'octopus'}
ram: '65536'
uuid: 0051e926-f242-e511-906e-0012795d96dd
ipmi_passwords: {'172.30.8.90': 'octopus', '172.30.8.91': 'octopus'}
+neutron_subnet_cidr: '192.168.122.0/24'
+neutron_subnet_gateway: '192.168.122.1'
+neutron_subnet_allocation_pools:
+ - 'start=192.168.122.50,end=192.168.122.254'
+virt_type: 'qemu'