Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding keystone parameters for Tacker"
[apex-tripleo-heat-templates.git]
/
puppet
/
extraconfig
/
all_nodes
/
neutron-ml2-cisco-nexus-ucsm.yaml
diff --git
a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
index
728c7cc
..
9b900bc
100644
(file)
--- a/
puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
+++ b/
puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2015-04-30
+heat_template_version:
ocata
description: Configure hieradata for Network Cisco configuration
description: Configure hieradata for Network Cisco configuration
@@
-132,7
+132,7
@@
resources:
properties:
name: NetworkCiscoDeployment
config: {get_resource: NetworkCiscoConfig}
properties:
name: NetworkCiscoDeployment
config: {get_resource: NetworkCiscoConfig}
- servers: {get_param:
servers, Controller
}
+ servers: {get_param:
[servers, Controller]
}
input_values:
UCSM_ip: {get_param: NetworkUCSMIp}
UCSM_username: {get_param: NetworkUCSMUsername}
input_values:
UCSM_ip: {get_param: NetworkUCSMIp}
UCSM_username: {get_param: NetworkUCSMUsername}
@@
-179,7
+179,7
@@
resources:
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsController
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsController
- servers: {get_param:
servers, Controller
}
+ servers: {get_param:
[servers, Controller]
}
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
@@
-187,7
+187,7
@@
resources:
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsCompute
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsCompute
- servers: {get_param:
servers, Compute
}
+ servers: {get_param:
[servers, Compute]
}
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
@@
-195,7
+195,7
@@
resources:
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsBlockStorage
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsBlockStorage
- servers: {get_param:
servers, BlockStorage
}
+ servers: {get_param:
[servers, BlockStorage]
}
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
@@
-203,7
+203,7
@@
resources:
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsObjectStorage
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsObjectStorage
- servers: {get_param:
servers, ObjectStorage
}
+ servers: {get_param:
[servers, ObjectStorage]
}
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
@@
-211,7
+211,7
@@
resources:
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsCephStorage
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsCephStorage
- servers: {get_param:
servers, CephStorage
}
+ servers: {get_param:
[servers, CephStorage]
}
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
@@
-245,7
+245,9
@@
resources:
for map_name in mappings:
f_name = '/root/' + map_name
map_data = os.getenv(map_name, "Nada")
for map_name in mappings:
f_name = '/root/' + map_name
map_data = os.getenv(map_name, "Nada")
- with open(f_name, 'a') as f:
+ with os.fdopen(os.open(f_name,
+ os.O_CREAT | os.O_TRUNC | os.O_WRONLY, 0o644),
+ 'w') as f:
f.write(map_data)
if map_data is not "Nada":
if map_name is not 'nexus_config':
f.write(map_data)
if map_data is not "Nada":
if map_name is not 'nexus_config':
@@
-260,7
+262,9
@@
resources:
for mac in vals[1:]:
mac2host[mac.lower()] = vals[0]
for mac in vals[1:]:
mac2host[mac.lower()] = vals[0]
- with open('/root/mac2host', 'a') as f:
+ with os.fdopen(os.open('/root/mac2host',
+ os.O_CREAT | os.O_TRUNC | os.O_WRONLY, 0o644),
+ 'w') as f:
f.write(str(mac2host))
# now we have mac to host, map host to switchport in hieradata
f.write(str(mac2host))
# now we have mac to host, map host to switchport in hieradata