Add sample environments for routed networks
Also fixes a problem with the base environment that was preventing the env-generator from functioning with the new template layout.
This commit is contained in:
Ben Nemec
parent
0818602c8e
commit
ef30ff2e56
@ -136,6 +136,26 @@ Disable the Undercloud in a QuintupleO Stack
|
||||
instance.
|
||||
|
||||
|
||||
Base Role Configuration for Routed Networks
|
||||
-------------------------------------------
|
||||
|
||||
**File:** environments/routed-networks-role.yaml
|
||||
|
||||
**Description:** A base role environment that contains the necessary parameters for
|
||||
deploying with routed networks.
|
||||
|
||||
|
||||
Enable Routed Networks
|
||||
----------------------
|
||||
|
||||
**File:** environments/routed-networks.yaml
|
||||
|
||||
**Description:** Enable use of routed networks, where there may be multiple separate
|
||||
networks connected with a router and DHCP relay. Do not pass any other
|
||||
network configuration environments after this one or they may override
|
||||
the changes made by this environment.
|
||||
|
||||
|
||||
Assign the Undercloud an Existing Floating IP
|
||||
---------------------------------------------
|
||||
|
||||
|
||||
48
environments/routed-networks-role.yaml
Normal file
48
environments/routed-networks-role.yaml
Normal file
@ -0,0 +1,48 @@
|
||||
# *******************************************************************
|
||||
# This file was created automatically by the sample environment
|
||||
# generator. Developers should use `tox -e genconfig` to update it.
|
||||
# Users are recommended to make changes to a copy of the file instead
|
||||
# of the original, if any customizations are needed.
|
||||
# *******************************************************************
|
||||
# title: Base Role Configuration for Routed Networks
|
||||
# description: |
|
||||
# A base role environment that contains the necessary parameters for
|
||||
# deploying with routed networks.
|
||||
parameter_defaults:
|
||||
# Recommended to be at least 1 vcpu, 4 GB RAM, 50 GB disk
|
||||
# Type: string
|
||||
baremetal_flavor: baremetal
|
||||
|
||||
# Nova keypair to inject into the undercloud and bmc
|
||||
# Type: string
|
||||
key_name: default
|
||||
|
||||
# Number of baremetal nodes to deploy
|
||||
# Type: number
|
||||
node_count: 2
|
||||
|
||||
# Name of internal API network
|
||||
# Type: string
|
||||
overcloud_internal_net: overcloud_internal2
|
||||
|
||||
# Name of storage management network
|
||||
# Type: string
|
||||
overcloud_storage_mgmt_net: overcloud_storage_mgmt2
|
||||
|
||||
# Name of storage network
|
||||
# Type: string
|
||||
overcloud_storage_net: overcloud_storage2
|
||||
|
||||
# Name of tenant network
|
||||
# Type: string
|
||||
overcloud_tenant_net: overcloud_tenant2
|
||||
|
||||
# Name of a network that will be used for provisioning traffic
|
||||
# Type: string
|
||||
provision_net: provision2
|
||||
|
||||
# The default role for nodes in this environment. This parameter is
|
||||
# ignored by Heat, but used by build-nodes-json.
|
||||
# Type: string
|
||||
role: leaf1
|
||||
|
||||
26
environments/routed-networks.yaml
Normal file
26
environments/routed-networks.yaml
Normal file
@ -0,0 +1,26 @@
|
||||
# *******************************************************************
|
||||
# This file was created automatically by the sample environment
|
||||
# generator. Developers should use `tox -e genconfig` to update it.
|
||||
# Users are recommended to make changes to a copy of the file instead
|
||||
# of the original, if any customizations are needed.
|
||||
# *******************************************************************
|
||||
# title: Enable Routed Networks
|
||||
# description: |
|
||||
# Enable use of routed networks, where there may be multiple separate
|
||||
# networks connected with a router and DHCP relay. Do not pass any other
|
||||
# network configuration environments after this one or they may override
|
||||
# the changes made by this environment.
|
||||
parameter_defaults:
|
||||
# The Nova flavor to use for the dhcrelay instance
|
||||
# Type: string
|
||||
dhcp_relay_flavor: m1.small
|
||||
|
||||
# The base image for the dhcrelay instance. A CentOS 7 image is currently
|
||||
# the only one supported.
|
||||
# Type: string
|
||||
dhcp_relay_image: CentOS-7-x86_64-GenericCloud
|
||||
|
||||
resource_registry:
|
||||
OS::OVB::BaremetalNetworks: templates/baremetal-networks-routed.yaml
|
||||
OS::OVB::DHCPRelay: templates/dhcp-relay.yaml
|
||||
OS::OVB::UndercloudNetworks: templates/undercloud-networks-routed.yaml
|
||||
@ -14,15 +14,17 @@ environments:
|
||||
- bmc_prefix
|
||||
- baremetal_prefix
|
||||
- node_count
|
||||
- public_net
|
||||
- public_net_shared
|
||||
- provision_net
|
||||
- provision_net_shared
|
||||
- undercloud_name
|
||||
- undercloud_image
|
||||
- undercloud_flavor
|
||||
- external_net
|
||||
- role
|
||||
templates/undercloud-networks.yaml:
|
||||
parameters:
|
||||
- public_net
|
||||
- public_net_shared
|
||||
- provision_net
|
||||
- provision_net_shared
|
||||
sample_values:
|
||||
baremetal_image: ipxe-boot
|
||||
-
|
||||
@ -220,3 +222,50 @@ environments:
|
||||
- bmc_use_cache
|
||||
sample_values:
|
||||
bmc_use_cache: True
|
||||
-
|
||||
name: routed-networks
|
||||
title: Enable Routed Networks
|
||||
description: |
|
||||
Enable use of routed networks, where there may be multiple separate
|
||||
networks connected with a router and DHCP relay. Do not pass any other
|
||||
network configuration environments after this one or they may override
|
||||
the changes made by this environment.
|
||||
files:
|
||||
templates/dhcp-relay.yaml:
|
||||
parameters:
|
||||
- dhcp_relay_flavor
|
||||
- dhcp_relay_image
|
||||
resource_registry:
|
||||
OS::OVB::UndercloudNetworks: templates/undercloud-networks-routed.yaml
|
||||
OS::OVB::BaremetalNetworks: templates/baremetal-networks-routed.yaml
|
||||
OS::OVB::DHCPRelay: templates/dhcp-relay.yaml
|
||||
-
|
||||
name: routed-networks-role
|
||||
title: Base Role Configuration for Routed Networks
|
||||
description: |
|
||||
A base role environment that contains the necessary parameters for
|
||||
deploying with routed networks.
|
||||
files:
|
||||
templates/quintupleo.yaml:
|
||||
parameters:
|
||||
- baremetal_flavor
|
||||
- key_name
|
||||
- node_count
|
||||
- role
|
||||
templates/undercloud-networks.yaml:
|
||||
parameters:
|
||||
- provision_net
|
||||
templates/baremetal-networks-all.yaml:
|
||||
parameters:
|
||||
- overcloud_internal_net
|
||||
- overcloud_storage_net
|
||||
- overcloud_storage_mgmt_net
|
||||
- overcloud_tenant_net
|
||||
sample_values:
|
||||
role: leaf1
|
||||
provision_net: provision2
|
||||
overcloud_internal_net: overcloud_internal2
|
||||
overcloud_storage_net: overcloud_storage2
|
||||
overcloud_storage_mgmt_net: overcloud_storage_mgmt2
|
||||
overcloud_tenant_net: overcloud_tenant2
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user