Remove unused elements
hiera and serverspec aren't used anymore, let's thrash it. Change-Id: I7ae66e6b5586084e757fbbc4e3080e3ec1c173fe
This commit is contained in:
parent
c08e3a4f7e
commit
cbc5be9167
@ -1,20 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -eux
|
|
||||||
|
|
||||||
# There is a new hiera hook in town. If it is writing out
|
|
||||||
# /etc/puppet/hiera.yaml then we need to disable the o-a-c
|
|
||||||
# script that writes out the old one here. We flag on the fact
|
|
||||||
# that the new version only writes out JSON (no YAML)
|
|
||||||
if [ -f /etc/puppet/hiera.yaml ] &&
|
|
||||||
! grep yaml /etc/puppet/hiera.yaml &> /dev/null; then
|
|
||||||
if [ -f /usr/libexec/os-apply-config/templates/etc/puppet/hiera.yaml ]; then
|
|
||||||
rm /usr/libexec/os-apply-config/templates/etc/puppet/hiera.yaml
|
|
||||||
fi
|
|
||||||
if [ -f /usr/libexec/os-refresh-config/configure.d/40-hiera-datafiles ]; then
|
|
||||||
rm /usr/libexec/os-refresh-config/configure.d/40-hiera-datafiles
|
|
||||||
fi
|
|
||||||
if ls /etc/puppet/hieradata/*.yaml &> /dev/null; then
|
|
||||||
rm /etc/puppet/hieradata/*.yaml
|
|
||||||
fi
|
|
||||||
fi
|
|
@ -1,74 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Configure hiera datafiles based on Heat metadata.
|
|
||||||
set -eu
|
|
||||||
|
|
||||||
(umask 077 ; mkdir -p /etc/puppet/hieradata)
|
|
||||||
|
|
||||||
function write_oac_data() {
|
|
||||||
local key=$1
|
|
||||||
local filename=$2
|
|
||||||
# Lookup data for the associated mapping (hiera.datafiles.<name>.oac_data)
|
|
||||||
local HIERA_DATA=$(os-apply-config --key $key --type raw --key-default '')
|
|
||||||
local HIERA_DATAMAP_KEYS=$(jq keys <<< $HIERA_DATA)
|
|
||||||
local COUNT=$(($(jq length <<< $HIERA_DATAMAP_KEYS) - 1))
|
|
||||||
|
|
||||||
for i in $(seq 0 $COUNT); do
|
|
||||||
local KEY=$(jq -r ".[$i]" <<< $HIERA_DATAMAP_KEYS)
|
|
||||||
local OAC_KEY=$(jq -r -a ".[\"$KEY\"]" <<< $HIERA_DATA)
|
|
||||||
local OAC_VALUE=$(os-apply-config --key $OAC_KEY --type raw --key-default '')
|
|
||||||
# Quote multi-line strings for YAML
|
|
||||||
if [ $(echo -ne "$OAC_VALUE" | grep -c '$') -gt 1 ]; then
|
|
||||||
echo "$KEY: '$OAC_VALUE'" >> $filename
|
|
||||||
else
|
|
||||||
echo "$KEY: $OAC_VALUE" >> $filename
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
function write_mapped_data() {
|
|
||||||
local key=$1
|
|
||||||
local filename=$2
|
|
||||||
# Lookup data for the associated mapping (hiera.datafiles.<name>.mapped_data)
|
|
||||||
local HIERA_DATA=$(os-apply-config --key $key --type raw --key-default '')
|
|
||||||
local HIERA_DATAMAP_KEYS=$(jq keys <<< $HIERA_DATA)
|
|
||||||
local COUNT=$(($(jq length <<< $HIERA_DATAMAP_KEYS) - 1))
|
|
||||||
|
|
||||||
for i in $(seq 0 $COUNT); do
|
|
||||||
local KEY=$(jq -r ".[$i]" <<< $HIERA_DATAMAP_KEYS)
|
|
||||||
local TYPE=$(jq -r ".[\"$KEY\"] | type" <<< $HIERA_DATA)
|
|
||||||
local VALUE=$(jq -a ".[\"$KEY\"]" <<< $HIERA_DATA)
|
|
||||||
|
|
||||||
# FIXME: We should pass data types unchanged from Heat metadata to
|
|
||||||
# hiera. For now we need to treat single-line strings as raw data
|
|
||||||
# because we already depend on this in tripleo-heat-templates
|
|
||||||
# (e.g. we generate strings which look like arrays and depend on
|
|
||||||
# them being processed as real arrays in hiera).
|
|
||||||
if [ "$TYPE" = "string" ]; then
|
|
||||||
local RAW_VALUE=$(jq -r -a ".[\"$KEY\"]" <<< $HIERA_DATA)
|
|
||||||
# Treat single-line strings as raw data
|
|
||||||
if [ $(echo -ne "$RAW_VALUE" | grep -c '$') -gt 1 ]; then
|
|
||||||
echo "$KEY: $VALUE" >> $filename
|
|
||||||
else
|
|
||||||
echo "$KEY: $RAW_VALUE" >> $filename
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "$KEY: $VALUE" >> $filename
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
# Loop over all the datafiles
|
|
||||||
HIERA_DATAFILES=$(os-apply-config --key hiera.datafiles --type raw --key-default '')
|
|
||||||
HIERA_DATAFILE_KEYS=$(jq keys <<< $HIERA_DATAFILES)
|
|
||||||
COUNT=$(($(jq length <<< $HIERA_DATAFILE_KEYS) - 1))
|
|
||||||
for i in $(seq 0 $COUNT); do
|
|
||||||
KEY=$(jq -r ".[$i]" <<< $HIERA_DATAFILE_KEYS)
|
|
||||||
FILENAME="/etc/puppet/hieradata/$KEY.yaml"
|
|
||||||
# First we write out any static data
|
|
||||||
HIERA_DATA=$(os-apply-config --key hiera.datafiles.$KEY.raw_data --type raw --key-default '')
|
|
||||||
echo -e "$HIERA_DATA" > /etc/puppet/hieradata/$KEY.yaml
|
|
||||||
write_mapped_data "hiera.datafiles.${KEY}.mapped_data" $FILENAME
|
|
||||||
write_oac_data "hiera.datafiles.${KEY}.oac_data" $FILENAME
|
|
||||||
done
|
|
@ -1,65 +0,0 @@
|
|||||||
Configure Hiera for use w/ Puppet and Heat metadata.
|
|
||||||
|
|
||||||
Configuration
|
|
||||||
-------------
|
|
||||||
|
|
||||||
hiera:
|
|
||||||
hierarchy: []
|
|
||||||
- The order to load datafiles. This is configured in hiera.yaml.
|
|
||||||
|
|
||||||
datafiles: {}
|
|
||||||
Data files is a hash of filename -> {data/mappings} to inject
|
|
||||||
into each named hiera datafile. There are three types:
|
|
||||||
|
|
||||||
raw_data: contains static raw data to inject directly into this hiera
|
|
||||||
datafile. Can be an inline string or imported via get_file in a
|
|
||||||
Heat template.
|
|
||||||
|
|
||||||
mapped_data: Name value pairs that will be injected into the
|
|
||||||
hiera data file. Hiera name on the left, Hiera value on the right.
|
|
||||||
|
|
||||||
oac_data: A hash of puppet -> OAC (os-apply-config) named key value
|
|
||||||
pairs. Arbitrary os-apply-config data can be mapped to Hiera keys
|
|
||||||
using this data. Hiera name on the left. The Hiera value is generated
|
|
||||||
at os-refresh-config time via os-apply-config lookup of the value.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
--------
|
|
||||||
|
|
||||||
HieraConfig:
|
|
||||||
type: OS::Heat::StructuredConfig
|
|
||||||
properties:
|
|
||||||
group: os-apply-config
|
|
||||||
config:
|
|
||||||
hiera:
|
|
||||||
hierarchy:
|
|
||||||
- heat_config_%{::deploy_config_name}
|
|
||||||
- controller
|
|
||||||
- common
|
|
||||||
datafiles:
|
|
||||||
controller:
|
|
||||||
raw_data: {get_file: puppet/hieradata/controller.yaml}
|
|
||||||
oac_data:
|
|
||||||
bootstrap_nodeid: bootstrap_host.bootstrap_nodeid
|
|
||||||
common:
|
|
||||||
data: {get_file: puppet/hieradata/common.yaml}
|
|
||||||
|
|
||||||
HieraDeployment:
|
|
||||||
type: OS::Heat::StructuredDeployment
|
|
||||||
properties:
|
|
||||||
server: {get_resource: MyServer}
|
|
||||||
config: {get_resource: HieraConfig}
|
|
||||||
signal_transport: NO_SIGNAL
|
|
||||||
|
|
||||||
In this example the 'hierarchy' config section controls the ordering of the
|
|
||||||
hiera files within hiera.yaml. The 'datafiles' config section controls the
|
|
||||||
actual hiera data files which gets injected into the node.
|
|
||||||
|
|
||||||
NOTE:
|
|
||||||
This example makes use of a special heat\_config\_%{::deploy\_config\_name}
|
|
||||||
heira datafile which gets generated via the heat-config-puppet element when
|
|
||||||
enable\_hiera is set to True. Since this file is injected automatically
|
|
||||||
we don't specify it in 'datafiles' but we do have it listed in the 'hierarchy'.
|
|
||||||
A FACTER\_ variable is used to provide access to the ::deploy\_config\_name
|
|
||||||
variable which is automatically set via the heat-config-puppet element when
|
|
||||||
puppet apply is executed.
|
|
@ -1,4 +0,0 @@
|
|||||||
os-apply-config
|
|
||||||
os-refresh-config
|
|
||||||
package-installs
|
|
||||||
puppet
|
|
@ -1,6 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -eux
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
ln -f -s /etc/puppet/hiera.yaml /etc/hiera.yaml
|
|
@ -1,8 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -eux
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
mkdir -p /usr/libexec/os-refresh-config/configure.d/
|
|
||||||
install -m 0755 -o root -g root $(dirname $0)/../10-hiera-disable /usr/libexec/os-refresh-config/configure.d/10-hiera-disable
|
|
||||||
install -m 0755 -o root -g root $(dirname $0)/../40-hiera-datafiles /usr/libexec/os-refresh-config/configure.d/40-hiera-datafiles
|
|
@ -1,2 +0,0 @@
|
|||||||
jq
|
|
||||||
rubygem_deep_merge_package
|
|
@ -1,12 +0,0 @@
|
|||||||
---
|
|
||||||
:backends:
|
|
||||||
- json
|
|
||||||
- yaml
|
|
||||||
:json:
|
|
||||||
:datadir: /etc/puppet/hieradata
|
|
||||||
:yaml:
|
|
||||||
:datadir: /etc/puppet/hieradata
|
|
||||||
:hierarchy:
|
|
||||||
{{#hiera.hierarchy}}
|
|
||||||
- {{.}}
|
|
||||||
{{/hiera.hierarchy}}
|
|
@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"default": {
|
|
||||||
"rubygem_deep_merge_package": "rubygem-deep_merge"
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
Install serverspec.
|
|
||||||
|
|
||||||
Supports gem based for now. Package mode will be eventually supported later.
|
|
||||||
|
|
||||||
To use gem:
|
|
||||||
|
|
||||||
export DIB\_INSTALLTYPE\_serverspec=source
|
|
||||||
|
|
||||||
Configuration
|
|
||||||
-------------
|
|
||||||
None.
|
|
@ -1,2 +0,0 @@
|
|||||||
package-installs
|
|
||||||
pkg-map
|
|
@ -1 +0,0 @@
|
|||||||
rubygems_package
|
|
@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -eux
|
|
||||||
|
|
||||||
gem install serverspec
|
|
@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"default": {
|
|
||||||
"rubygems_package": "rubygems"
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user