summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-10-05 09:15:08 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-05 09:15:08 +0000
commit3ea7b3944090beb21e7dc8bc16f638e14498cc58 (patch)
tree90a317ee6ae1d1196fc55193846e521abaf194e3
parentd886d9bda19b153024a0cebf9be3146847df0451 (diff)
parentb56385ef02e205989f20494e42b9eb2fb0231b74 (diff)
Merge "Fix naming and ips for controller and compute"
-rw-r--r--prototypes/puppet-infracloud/hiera/common.yaml16
1 files changed, 8 insertions, 8 deletions
diff --git a/prototypes/puppet-infracloud/hiera/common.yaml b/prototypes/puppet-infracloud/hiera/common.yaml
index 5a758afe4..19460fbff 100644
--- 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:
- controller000.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
- 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
- name: controller000.opnfvlocal
+ name: controller00.opnfvlocal
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
- compute000.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
- 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
- name: compute000.opnfvlocal
+ name: compute00.opnfvlocal
nics:
- mac: a4:bf:01:01:a9:d4
- mac: 00:1e:67:f6:9b:37