Remove some legacy stuff
The heat-templates, jenkins-jobs, and deploy-baremetal-overcloudrc are not used in the current instack-undercloud, and were never used in a released version. Change-Id: Icc3030e3ae2ebb310692903779683a90c315fdfb
This commit is contained in:
Ben Nemec
Ben Nemec
parent
f5c0daf5b9
commit
a46193ebb4
|
|
@ -1,38 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Interface where external network is attached to overcloud controller(s).
|
||||
# This interface will be used by the controller(s) for floating IPs.
|
||||
export NeutronPublicInterface=nic1
|
||||
|
||||
# OVERCLOUD_LIBVIRT_TYPE may be either kvm or qemu (if using nested virt).
|
||||
export OVERCLOUD_LIBVIRT_TYPE=kvm
|
||||
|
||||
# Network CIDR to use when creating "default-net" tenant network. This
|
||||
# will be used for the VM instances. This network should not overlap
|
||||
# with any other subnets used on the network.
|
||||
export NETWORK_CIDR="10.0.0.0/24"
|
||||
|
||||
# Range of IP addresses to add to Neutron floating ip pool. These should
|
||||
# be on the same network where NeutronPublicInterface is attached. This
|
||||
# range of IP addresses should not overlap with any addresses that are in
|
||||
# use or may be assigned by DHCP.
|
||||
export FLOATING_IP_START="172.17.0.45"
|
||||
export FLOATING_IP_END="172.17.0.64"
|
||||
|
||||
# Network subnet for external network. This is the subnet that will be
|
||||
# used for floating IPs. In the form 172.17.0.0/24
|
||||
export FLOATING_IP_CIDR="172.17.0.0/24"
|
||||
|
||||
# Network gateway on external network. This is the address of the gateway
|
||||
# that provides external access on the external network.
|
||||
export BM_NETWORK_GATEWAY="172.17.0.1"
|
||||
|
||||
# Network type may be gre or vxlan.
|
||||
export NEUTRON_NETWORK_TYPE=gre
|
||||
|
||||
# Should match the NEURTRON_NETWORK_TYPE above.
|
||||
export NEUTRON_TUNNEL_TYPES=gre
|
||||
|
||||
# Set the number of nodes to provision for each class of server.
|
||||
export COMPUTESCALE=1
|
||||
export BLOCKSTORAGESCALE=0
|
||||
export SWIFTSTORAGESCALE=0
|
||||
|
|
@ -1,134 +0,0 @@
|
|||
heat_template_version: 2014-10-16
|
||||
|
||||
parameters:
|
||||
config_drive_label:
|
||||
type: string
|
||||
default: config-2
|
||||
|
||||
discovery_metadata_key:
|
||||
type: string
|
||||
default: hardware
|
||||
|
||||
control_flavor:
|
||||
type: string
|
||||
default: baremetal_control
|
||||
|
||||
compute_flavor:
|
||||
type: string
|
||||
default: baremetal_compute
|
||||
|
||||
image:
|
||||
type: string
|
||||
default: openstack-full
|
||||
|
||||
key_name:
|
||||
type: string
|
||||
default: default
|
||||
|
||||
control_count:
|
||||
type: number
|
||||
default: 3
|
||||
|
||||
compute_count:
|
||||
type: number
|
||||
default: 0
|
||||
|
||||
nic_count:
|
||||
type: number
|
||||
default: 4
|
||||
|
||||
resources:
|
||||
nic_config:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: ungrouped
|
||||
config:
|
||||
str_replace:
|
||||
template: |
|
||||
#!/bin/bash -v
|
||||
# Mount the config drive and extract the discovery data
|
||||
mount /dev/disk/by-label/disklabel /mnt
|
||||
jq -r ".metadata_key" /mnt/openstack/latest/meta_data.json > /tmp/discovery.json
|
||||
|
||||
# Extract discovery data to make os-net-config mapping
|
||||
mkdir -p /etc/os-net-config
|
||||
echo "interface_mapping:" > /etc/os-net-config/mapping.yaml
|
||||
for ii in $(seq 1 num_nics)
|
||||
do
|
||||
echo "Processing nic $ii"
|
||||
mapped=$(jq -r ".hardware.nic$ii" /mnt/openstack/latest/meta_data.json)
|
||||
echo "mapped nic is $mapped"
|
||||
if [ $mapped != 'null' ]; then
|
||||
echo " nic$ii: $mapped" >> /etc/os-net-config/mapping.yaml
|
||||
fi
|
||||
done
|
||||
echo "persist_mapping: True" >> /etc/os-net-config/mapping.yaml
|
||||
|
||||
# Create the required network config
|
||||
# Note, for less minimal templates this would probably be done via a SoftwareConfig
|
||||
# or StructuredConfig resource so alternate configurations (e.g bonded multiple
|
||||
# nics or whatever) could easily be substituted.
|
||||
cat > /etc/os-net-config/config.yaml << ENDOFCAT
|
||||
network_config:
|
||||
-
|
||||
type: interface
|
||||
name: nic1
|
||||
use_dhcp: True
|
||||
-
|
||||
type: interface
|
||||
name: nic2
|
||||
use_dhcp: True
|
||||
ENDOFCAT
|
||||
|
||||
# Apply the config
|
||||
os-net-config --cleanup --no-ifup --no-ifdown
|
||||
|
||||
# Remove the mapping file, or any subsequent run of
|
||||
# os-net-config will fail due to now non-existent nics
|
||||
rm -f /etc/os-net-config/mapping.yaml
|
||||
|
||||
# Enable ssh as root for Puppet.
|
||||
sed -i -e 's/.*ssh-/ssh-/' ~root/.ssh/authorized_keys
|
||||
|
||||
# Reboot for the renamed networking to take effect
|
||||
/sbin/reboot
|
||||
params:
|
||||
disklabel: { get_param: config_drive_label }
|
||||
metadata_key: { get_param: discovery_metadata_key }
|
||||
num_nics: {get_param: nic_count}
|
||||
|
||||
server_init:
|
||||
type: OS::Heat::MultipartMime
|
||||
properties:
|
||||
parts:
|
||||
- config: {get_resource: nic_config}
|
||||
|
||||
control_servers:
|
||||
type: OS::Heat::ResourceGroup
|
||||
properties:
|
||||
count: {get_param: control_count}
|
||||
resource_def:
|
||||
type: OS::Nova::Server
|
||||
properties:
|
||||
flavor: {get_param: control_flavor}
|
||||
image: {get_param: image}
|
||||
key_name: {get_param: key_name}
|
||||
config_drive: True
|
||||
user_data_format: RAW
|
||||
user_data: {get_resource: server_init}
|
||||
|
||||
compute_servers:
|
||||
type: OS::Heat::ResourceGroup
|
||||
properties:
|
||||
count: {get_param: compute_count}
|
||||
resource_def:
|
||||
type: OS::Nova::Server
|
||||
properties:
|
||||
flavor: {get_param: compute_flavor}
|
||||
image: {get_param: image}
|
||||
key_name: {get_param: key_name}
|
||||
config_drive: True
|
||||
name: openstack%index%
|
||||
user_data_format: RAW
|
||||
user_data: {get_resource: server_init}
|
||||
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
heat_template_version: 2014-10-16
|
||||
|
||||
parameters:
|
||||
config_drive_label:
|
||||
type: string
|
||||
default: config-2
|
||||
|
||||
discovery_metadata_key:
|
||||
type: string
|
||||
default: hardware
|
||||
|
||||
control_flavor:
|
||||
type: string
|
||||
default: baremetal_control
|
||||
|
||||
compute_flavor:
|
||||
type: string
|
||||
default: baremetal_compute
|
||||
|
||||
image:
|
||||
type: string
|
||||
default: openstack-full
|
||||
|
||||
key_name:
|
||||
type: string
|
||||
default: default
|
||||
|
||||
control_count:
|
||||
type: number
|
||||
default: 3
|
||||
|
||||
compute_count:
|
||||
type: number
|
||||
default: 0
|
||||
|
||||
resources:
|
||||
control_servers:
|
||||
type: OS::Heat::ResourceGroup
|
||||
properties:
|
||||
count: {get_param: control_count}
|
||||
resource_def:
|
||||
type: OS::Nova::Server
|
||||
properties:
|
||||
flavor: {get_param: control_flavor}
|
||||
image: {get_param: image}
|
||||
key_name: {get_param: key_name}
|
||||
config_drive: True
|
||||
user_data:
|
||||
str_replace:
|
||||
template: |
|
||||
#!/bin/bash -v
|
||||
# Mount the config drive and extract the discovery data
|
||||
mount /dev/disk/by-label/disklabel /mnt
|
||||
jq -r ".metadata_key" /mnt/openstack/latest/meta_data.json > /tmp/discovery.json
|
||||
# Enable ssh as root for Puppet.
|
||||
sed -i -e 's/.*ssh-/ssh-/' ~root/.ssh/authorized_keys
|
||||
|
||||
params:
|
||||
disklabel: { get_param: config_drive_label }
|
||||
metadata_key: { get_param: discovery_metadata_key }
|
||||
|
||||
compute_servers:
|
||||
type: OS::Heat::ResourceGroup
|
||||
properties:
|
||||
count: {get_param: compute_count}
|
||||
resource_def:
|
||||
type: OS::Nova::Server
|
||||
properties:
|
||||
flavor: {get_param: compute_flavor}
|
||||
image: {get_param: image}
|
||||
key_name: {get_param: key_name}
|
||||
config_drive: True
|
||||
name: openstack%index%
|
||||
user_data:
|
||||
str_replace:
|
||||
template: |
|
||||
#!/bin/bash -v
|
||||
# Mount the config drive and extract the discovery data
|
||||
mount /dev/disk/by-label/disklabel /mnt
|
||||
jq -r ".metadata_key" /mnt/openstack/latest/meta_data.json > /tmp/discovery.json
|
||||
# Enable ssh as root for Puppet.
|
||||
sed -i -e 's/.*ssh-/ssh-/' ~root/.ssh/authorized_keys
|
||||
|
||||
params:
|
||||
disklabel: { get_param: config_drive_label }
|
||||
metadata_key: { get_param: discovery_metadata_key }
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
heat_template_version: 2014-10-16
|
||||
|
||||
parameters:
|
||||
flavor:
|
||||
type: string
|
||||
default: baremetal_compute
|
||||
|
||||
image:
|
||||
type: string
|
||||
default: os-disk-config
|
||||
|
||||
key_name:
|
||||
type: string
|
||||
default: default
|
||||
|
||||
node_count:
|
||||
type: number
|
||||
default: 1
|
||||
|
||||
disk_config:
|
||||
type: string
|
||||
default: {}
|
||||
|
||||
resources:
|
||||
disk_config_servers:
|
||||
type: OS::Heat::ResourceGroup
|
||||
properties:
|
||||
count: {get_param: node_count}
|
||||
resource_def:
|
||||
type: OS::TripleO::DiskConfig
|
||||
properties:
|
||||
flavor: {get_param: flavor}
|
||||
image: {get_param: image}
|
||||
key_name: {get_param: key_name}
|
||||
disk_config: {get_param: disk_config}
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
heat_template_version: 2014-10-16
|
||||
|
||||
description: Test os-disk-config node. Can be wrapped in a ResourceGroup for scaling.
|
||||
|
||||
parameters:
|
||||
disk_config:
|
||||
default: {}
|
||||
type: string
|
||||
|
||||
flavor:
|
||||
type: string
|
||||
default: baremetal_compute
|
||||
|
||||
image:
|
||||
type: string
|
||||
default: os-disk-config
|
||||
|
||||
key_name:
|
||||
type: string
|
||||
default: default
|
||||
|
||||
resources:
|
||||
DiskConfigServer:
|
||||
type: OS::Nova::Server
|
||||
properties:
|
||||
flavor: {get_param: flavor}
|
||||
image: {get_param: image}
|
||||
key_name: {get_param: key_name}
|
||||
user_data_format: SOFTWARE_CONFIG
|
||||
#name: os-disk-config%index%
|
||||
|
||||
ServerConfig:
|
||||
type: OS::Heat::StructuredConfig
|
||||
properties:
|
||||
group: os-apply-config
|
||||
config:
|
||||
os_disk_config: {get_input: disk_config}
|
||||
flavor: {get_input: flavor}
|
||||
image: {get_input: image}
|
||||
key_name: {get_input: key_name}
|
||||
|
||||
ServerDeployment:
|
||||
type: OS::Heat::StructuredDeployment
|
||||
properties:
|
||||
config: {get_resource: ServerConfig}
|
||||
server: {get_resource: DiskConfigServer}
|
||||
signal_transport: NO_SIGNAL
|
||||
input_values:
|
||||
disk_config: {get_param: disk_config}
|
||||
flavor: {get_param: flavor}
|
||||
image: {get_param: image}
|
||||
key_name: {get_param: key_name}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
resource_registry:
|
||||
OS::TripleO::DiskConfig: os-disk-config.yaml
|
||||
|
||||
|
|
@ -1,156 +0,0 @@
|
|||
- job:
|
||||
name: 'instack-ironic-deployment-full'
|
||||
description: 'Use Ironic to do full node deployment'
|
||||
project-type: freestyle
|
||||
wrappers:
|
||||
- ansicolor:
|
||||
colormap: xterm
|
||||
builders:
|
||||
- shell: >
|
||||
sudo /bin/bash -c "
|
||||
source /root/stackrc;
|
||||
DEPLOY_HEAT_TEMPLATE=/home/stack/instack-undercloud/heat-templates/ironic-deployment.yaml
|
||||
NULL_STATS=1
|
||||
CONTROL_COUNT=1
|
||||
COMPUTE_COUNT=3
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--register-nodes
|
||||
--nodes-json /home/stack/instackenv.json
|
||||
--discover-nodes
|
||||
--show-profile
|
||||
--setup-flavors
|
||||
--deploy-nodes"
|
||||
- job:
|
||||
name: 'instack-ironic-deployment-registration'
|
||||
description: 'Use Ironic to do node registration'
|
||||
project-type: freestyle
|
||||
wrappers:
|
||||
- ansicolor:
|
||||
colormap: xterm
|
||||
builders:
|
||||
- shell: >
|
||||
sudo /bin/bash -c "
|
||||
source /root/stackrc;
|
||||
NULL_STATS=1
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--register-nodes
|
||||
--nodes-json /home/stack/instackenv.json"
|
||||
- job:
|
||||
name: 'instack-ironic-deployment-discovery'
|
||||
description: 'Use Ironic to do node discovery'
|
||||
project-type: freestyle
|
||||
wrappers:
|
||||
- ansicolor:
|
||||
colormap: xterm
|
||||
builders:
|
||||
- shell: >
|
||||
sudo /bin/bash -c "
|
||||
source /root/stackrc;
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--discover-nodes"
|
||||
- job:
|
||||
name: 'instack-ironic-deployment-deploy-only'
|
||||
description: 'Use Ironic to do node deployment only'
|
||||
project-type: freestyle
|
||||
wrappers:
|
||||
- ansicolor:
|
||||
colormap: xterm
|
||||
builders:
|
||||
- shell: >
|
||||
sudo /bin/bash -c "
|
||||
source /root/stackrc;
|
||||
DEPLOY_HEAT_TEMPLATE=/home/stack/instack-undercloud/heat-templates/ironic-deployment.yaml
|
||||
CONTROL_COUNT=1
|
||||
COMPUTE_COUNT=3
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--deploy-nodes"
|
||||
- job:
|
||||
name: 'instack-ironic-deployment-show-profiles'
|
||||
description: 'Use Ironic to show assigned node profiles'
|
||||
project-type: freestyle
|
||||
wrappers:
|
||||
- ansicolor:
|
||||
colormap: xterm
|
||||
builders:
|
||||
- shell: >
|
||||
sudo /bin/bash -c "
|
||||
source /root/stackrc;
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--show-profile"
|
||||
- job:
|
||||
name: 'instack-ironic-deployment-setup-flavors'
|
||||
description: 'Use Ironic to setup flavors'
|
||||
project-type: freestyle
|
||||
wrappers:
|
||||
- ansicolor:
|
||||
colormap: xterm
|
||||
builders:
|
||||
- shell: >
|
||||
sudo /bin/bash -c "
|
||||
source /root/stackrc;
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--setup-flavors"
|
||||
- job:
|
||||
name: 'instack-ironic-deployment-delete-stack'
|
||||
description: 'Use Ironic to setup flavors'
|
||||
project-type: freestyle
|
||||
wrappers:
|
||||
- ansicolor:
|
||||
colormap: xterm
|
||||
builders:
|
||||
- shell: >
|
||||
sudo /bin/bash -c "
|
||||
source /root/stackrc;
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--delete-stack"
|
||||
- job:
|
||||
name: 'instack-ironic-deployment-delete-nodes'
|
||||
description: 'Delete all nodes'
|
||||
project-type: freestyle
|
||||
wrappers:
|
||||
- ansicolor:
|
||||
colormap: xterm
|
||||
builders:
|
||||
- shell: >
|
||||
sudo /bin/bash -c "
|
||||
source /root/stackrc;
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--delete-nodes"
|
||||
- job:
|
||||
name: 'instack-ironic-deployment-clean-full'
|
||||
description: 'Clean up a previous deployment and then do a full deployment'
|
||||
project-type: freestyle
|
||||
wrappers:
|
||||
- ansicolor:
|
||||
colormap: xterm
|
||||
builders:
|
||||
- shell: >
|
||||
sudo /bin/bash -c "
|
||||
source /root/stackrc;
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--delete-stack
|
||||
--delete-nodes;
|
||||
DEPLOY_HEAT_TEMPLATE=/home/stack/instack-undercloud/heat-templates/ironic-deployment.yaml
|
||||
NULL_STATS=1
|
||||
CONTROL_COUNT=1
|
||||
COMPUTE_COUNT=3
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--register-nodes
|
||||
--nodes-json /home/stack/instackenv.json
|
||||
--discover-nodes
|
||||
--show-profile
|
||||
--setup-flavors
|
||||
--deploy-nodes"
|
||||
- job:
|
||||
name: 'instack-ironic-deployment-config-tools-provision'
|
||||
description: 'Run config-tools provision.sh to prep for Puppet'
|
||||
project-type: freestyle
|
||||
wrappers:
|
||||
- ansicolor:
|
||||
colormap: xterm
|
||||
builders:
|
||||
- shell: >
|
||||
sudo /bin/bash -c "
|
||||
source /root/stackrc;
|
||||
/home/stack/instack-undercloud/scripts/instack-ironic-deployment -x
|
||||
--config-tools-provision"
|
||||
|
|
@ -36,11 +36,8 @@ scripts =
|
|||
|
||||
data_files =
|
||||
share/instack-undercloud/ = elements/*
|
||||
share/instack-undercloud/heat-templates = heat-templates/*
|
||||
share/instack-undercloud/json-files = json-files/*
|
||||
share/instack-undercloud/jenkins-jobs = jenkins-jobs/*
|
||||
share/instack-undercloud/ = undercloud.conf.sample
|
||||
share/instack-undercloud/ = deploy-baremetal-overcloudrc
|
||||
|
||||
[entry_points]
|
||||
oslo.config.opts =
|
||||
|
|
|
|||
Loading…
Reference in New Issue