Remove mac_hostname & random_string
These resources aren't used anymore and are leftovers from previous Heat resources which don't exist anymore. Change-Id: I4b33df191c4eb3cd961bbdbaf6ef28844de6d1a9
This commit is contained in:
Emilien Macchi
parent
78c7e24d16
commit
e6fe9ff3d9
2
.gitignore
vendored
2
.gitignore
vendored
@ -52,8 +52,6 @@ doc/_build
|
||||
AUTHORS
|
||||
ChangeLog
|
||||
|
||||
extraconfig/all_nodes/mac_hostname.yaml
|
||||
extraconfig/all_nodes/random_string.yaml
|
||||
extraconfig/all_nodes/swap-partition.yaml
|
||||
extraconfig/all_nodes/swap.yaml
|
||||
extraconfig/tasks/major_upgrade_pacemaker_init.yaml
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
heat_template_version: rocky
|
||||
|
||||
description: >
|
||||
Example extra config for cluster config
|
||||
this example collects the hostname and MAC addresses for each node in
|
||||
the deployment, then distributes that info to all Controller nodes.
|
||||
|
||||
# Parameters passed from the parent template - note if you maintain
|
||||
# out-of-tree templates they may require additional parameters if the
|
||||
# in-tree templates add a new role.
|
||||
parameters:
|
||||
servers:
|
||||
type: json
|
||||
# Note extra parameters can be defined, then passed data via the
|
||||
# environment parameter_defaults, without modifying the parent template
|
||||
|
||||
resources:
|
||||
|
||||
CollectMacConfig:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: script
|
||||
config: |
|
||||
#!/bin/sh
|
||||
MACS=$(ifconfig | grep ether | awk '{print $2}' | tr "\n" " ")
|
||||
HOSTNAME=$(hostname -s)
|
||||
echo "$HOSTNAME $MACS"
|
||||
|
||||
# FIXME(shardy): Long term it'd be better if Heat SoftwareDeployments accepted
|
||||
# list instead of a map, then we could join the lists of servers into one
|
||||
# deployment instead of requiring one deployment per-role.
|
||||
{% for role in roles %}
|
||||
CollectMacDeployments{{role.name}}:
|
||||
type: OS::Heat::SoftwareDeploymentGroup
|
||||
properties:
|
||||
name: CollectMacDeploymentsController
|
||||
servers: {get_param: [servers, {{role.name}}]}
|
||||
config: {get_resource: CollectMacConfig}
|
||||
actions: ['CREATE'] # Only do this on CREATE
|
||||
{% endfor %}
|
||||
|
||||
# Now we distribute all-the-macs to all Controller nodes
|
||||
DistributeMacConfig:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: script
|
||||
inputs:
|
||||
- name: controller_mappings
|
||||
- name: compute_mappings
|
||||
- name: blockstorage_mappings
|
||||
- name: objectstorage_mappings
|
||||
- name: cephstorage_mappings
|
||||
config: |
|
||||
#!/bin/sh
|
||||
echo $controller_mappings > /root/controller_mappings
|
||||
echo $compute_mappings > /root/compute_mappings
|
||||
echo $blockstorage_mappings > /root/blockstorage_mappings
|
||||
echo $objectstorage_mappings > /root/objectstorage_mappings
|
||||
echo $cephstorage_mappings > /root/cephstorage_mappings
|
||||
echo "mappings = $(cat /root/*_mappings)"
|
||||
|
||||
DistributeMacDeploymentsController:
|
||||
type: OS::Heat::SoftwareDeploymentGroup
|
||||
properties:
|
||||
name: DistributeMacDeploymentsController
|
||||
servers: {get_param: [servers, Controller]}
|
||||
config: {get_resource: DistributeMacConfig}
|
||||
input_values:
|
||||
# FIXME(shardy): It'd be more convenient if we could join these
|
||||
# items together but because the returned format is a map (not a list)
|
||||
# we can't use list_join or str_replace. Possible Heat TODO.
|
||||
controller_mappings: {get_attr: [CollectMacDeploymentsController, deploy_stdouts]}
|
||||
compute_mappings: {get_attr: [CollectMacDeploymentsCompute, deploy_stdouts]}
|
||||
blockstorage_mappings: {get_attr: [CollectMacDeploymentsBlockStorage, deploy_stdouts]}
|
||||
objectstorage_mappings: {get_attr: [CollectMacDeploymentsObjectStorage, deploy_stdouts]}
|
||||
cephstorage_mappings: {get_attr: [CollectMacDeploymentsCephStorage, deploy_stdouts]}
|
||||
actions: ['CREATE'] # Only do this on CREATE
|
||||
@ -1,51 +0,0 @@
|
||||
heat_template_version: rocky
|
||||
|
||||
description: >
|
||||
Example extra config for cluster config
|
||||
this example deploys a random string to all controller and compute
|
||||
nodes, showing how data may be shared amongst nodes, vs the
|
||||
other ExtraConfig interfaces which act only on individual nodes.
|
||||
|
||||
# Parameters passed from the parent template - note if you maintain
|
||||
# out-of-tree templates they may require additional parameters if the
|
||||
# in-tree templates add a new role.
|
||||
parameters:
|
||||
servers:
|
||||
type: json
|
||||
# Note extra parameters can be defined, then passed data via the
|
||||
# environment parameter_defaults, without modifying the parent template
|
||||
|
||||
resources:
|
||||
|
||||
Random:
|
||||
type: OS::Heat::RandomString
|
||||
|
||||
RandomConfig:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: script
|
||||
inputs:
|
||||
- name: random_value
|
||||
config: |
|
||||
#!/bin/sh
|
||||
echo $random_value > /root/random_value
|
||||
|
||||
RandomDeploymentsController:
|
||||
type: OS::Heat::SoftwareDeploymentGroup
|
||||
properties:
|
||||
name: RandomDeploymentsController
|
||||
servers: {get_param: [servers, Controller]}
|
||||
config: {get_resource: RandomConfig}
|
||||
actions: ['CREATE'] # Only do this on CREATE
|
||||
input_values:
|
||||
random_value: {get_attr: [Random, value]}
|
||||
|
||||
RandomDeploymentsCompute:
|
||||
type: OS::Heat::SoftwareDeploymentGroup
|
||||
properties:
|
||||
name: RandomDeploymentsCompute
|
||||
servers: {get_param: [servers, Compute]}
|
||||
config: {get_resource: RandomConfig}
|
||||
actions: ['CREATE'] # Only do this on CREATE
|
||||
input_values:
|
||||
random_value: {get_attr: [Random, value]}
|
||||
Loading…
Reference in New Issue
Block a user