summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2013-09-16 13:27:59 -0700
committerJames Slagle <jslagle@redhat.com>2013-09-16 13:31:31 -0700
commitca4c32c086ae0584820a5833d826855e40814b53 (patch)
tree9975643daddece97e12d3068997b73864c573694
parenta973207ccf80fd638f2d211c2ef8b1431aa70249 (diff)
Update PrivateIp to first_private_address.
Update the PrivateIp attribute to first_private_address as a result of the change to the OS::Nova::Server type. Change-Id: Id90f8c7c4e0217e1f94d3e5134744a810390e7b7
-rw-r--r--nagios3.yaml2
-rw-r--r--nova-compute-instance.yaml2
-rw-r--r--overcloud-source.yaml34
-rw-r--r--undercloud-vm.yaml8
4 files changed, 23 insertions, 23 deletions
diff --git a/nagios3.yaml b/nagios3.yaml
index 4f6a4222..0bdb1d38 100644
--- a/nagios3.yaml
+++ b/nagios3.yaml
@@ -97,4 +97,4 @@ Resources:
InstanceType: {Ref: InstanceType}
Outputs:
Nagios3Host:
- Fn::GetAtt: [ nagios3 , PrivateIp ]
+ Fn::GetAtt: [ nagios3 , first_private_address ]
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index a3210447..ca8ff111 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -116,7 +116,7 @@ Resources:
local_ip:
Fn::GetAtt:
- NovaCompute0
- - PrivateIp
+ - first_private_address
tenant_network_type: {Ref: NeutronNetworkType}
network_vlan_ranges: {Ref: NeutronNetworkVLANRanges}
bridge_mappings: {Ref: NeutronBridgeMappings}
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index cf32fe5e..3acaa191 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -90,13 +90,13 @@ Resources:
Path: nova-compute-instance.yaml
SubKey: Resources.NovaCompute0Config
Parameters:
- NovaApiHost: {"Fn::GetAtt": [notcompute, PrivateIp]}
- KeystoneHost: {"Fn::GetAtt": [notcompute, PrivateIp]}
- RabbitHost: {"Fn::GetAtt": [notcompute, PrivateIp]}
- NeutronHost: {"Fn::GetAtt": [notcompute, PrivateIp]}
- GlanceHost: {"Fn::GetAtt": [notcompute, PrivateIp]}
- NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::GetAtt": [notcompute, PrivateIp]}, '/nova']]}
- NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::GetAtt": [notcompute, PrivateIp]}, '/neutron']]}
+ NovaApiHost: {"Fn::GetAtt": [notcompute, first_private_address]}
+ KeystoneHost: {"Fn::GetAtt": [notcompute, first_private_address]}
+ RabbitHost: {"Fn::GetAtt": [notcompute, first_private_address]}
+ NeutronHost: {"Fn::GetAtt": [notcompute, first_private_address]}
+ GlanceHost: {"Fn::GetAtt": [notcompute, first_private_address]}
+ NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::GetAtt": [notcompute, first_private_address]}, '/nova']]}
+ NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::GetAtt": [notcompute, first_private_address]}, '/neutron']]}
NeutronNetworkType: "gre"
NeutronEnableTunnelling: "True"
NeutronNetworkVLANRanges: ""
@@ -135,14 +135,14 @@ Resources:
controller-address:
Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
db-password: unset
glance:
db: mysql://glance:unset@localhost/glance
host:
Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
service-password:
Ref: GlancePassword
os-collect-config:
@@ -169,7 +169,7 @@ Resources:
- - 'http://'
- Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
- ':8003'
metadata_server_url:
Fn::Join:
@@ -177,7 +177,7 @@ Resources:
- - 'http://'
- Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
- ':8000'
waitcondition_server_url:
Fn::Join:
@@ -185,7 +185,7 @@ Resources:
- - 'http://'
- Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
- ':8000/v1/waitcondition'
interfaces:
control: eth0
@@ -194,14 +194,14 @@ Resources:
host:
Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
nova:
compute_driver: libvirt.LibvirtDriver
db: mysql://nova:unset@localhost/nova
host:
Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
metadata-proxy: true
service-password:
Ref: NovaPassword
@@ -209,14 +209,14 @@ Resources:
host:
Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
metadata_proxy_shared_secret: unset
ovs:
enable_tunneling: 'True'
local_ip:
Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
public_interface: eth0
physical_bridge: br-ex
tenant_network_type: gre
@@ -227,7 +227,7 @@ Resources:
host:
Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
password: guest
notcompute:
Type: OS::Nova::Server
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index b9cf0ec8..8a3a9d25 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -71,7 +71,7 @@ Resources:
controller-address:
Fn::GetAtt:
- notcompute
- - PrivateIp
+ - first_private_address
cinder:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
@@ -92,19 +92,19 @@ Resources:
Fn::Join:
- ''
- - http://
- - {"Fn::GetAtt": [ notcompute, PrivateIp ]}
+ - {"Fn::GetAtt": [ notcompute, first_private_address ]}
- ":8003"
metadata_server_url:
Fn::Join:
- ''
- - http://
- - {"Fn::GetAtt": [ notcompute, PrivateIp ]}
+ - {"Fn::GetAtt": [ notcompute, first_private_address ]}
- ":8000"
waitcondition_server_url:
Fn::Join:
- ''
- - http://
- - {"Fn::GetAtt": [ notcompute, PrivateIp ]}
+ - {"Fn::GetAtt": [ notcompute, first_private_address ]}
- ":8000/v1/waitcondition"
os-collect-config:
cfn: