[Core] Remove mitaka.
The mitaka release is no longer supported by the community. Change-Id: Iba4ed16f5d91973e43d3be040ce7e0eaf7396c73 Closes-Bug: #1722602
This commit is contained in:
parent
2a95949f2d
commit
dbc129238e
|
@ -36,9 +36,6 @@ function previous_release_mixed_upgrade_case {
|
||||||
ocata)
|
ocata)
|
||||||
echo "newton"
|
echo "newton"
|
||||||
;;
|
;;
|
||||||
newton)
|
|
||||||
echo "mitaka"
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
echo "UNKNOWN_RELEASE"
|
echo "UNKNOWN_RELEASE"
|
||||||
return 1
|
return 1
|
||||||
|
|
|
@ -49,16 +49,6 @@ except:
|
||||||
print("/usr/share/diskimage-builder/elements")
|
print("/usr/share/diskimage-builder/elements")
|
||||||
')
|
')
|
||||||
export ELEMENTS_PATH="${COMMON_ELEMENTS_PATH}:/usr/share/instack-undercloud:/usr/share/tripleo-image-elements:/usr/share/tripleo-puppet-elements"
|
export ELEMENTS_PATH="${COMMON_ELEMENTS_PATH}:/usr/share/instack-undercloud:/usr/share/tripleo-image-elements:/usr/share/tripleo-puppet-elements"
|
||||||
|
|
||||||
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
|
||||||
ELEMENTS=$(\
|
|
||||||
tripleo-build-images \
|
|
||||||
--image-json-output \
|
|
||||||
--image-config-file /usr/share/tripleo-common/image-yaml/overcloud-images-centos7.yaml \
|
|
||||||
--image-config-file /usr/share/tripleo-common/image-yaml/overcloud-images.yaml \
|
|
||||||
| jq '. | map(select(.imagename == "overcloud-full")) | .[0].elements | map(.+" ") | add' \
|
|
||||||
| sed 's/"//g')
|
|
||||||
else
|
|
||||||
ELEMENTS=$(\
|
ELEMENTS=$(\
|
||||||
tripleo-build-images \
|
tripleo-build-images \
|
||||||
--image-json-output \
|
--image-json-output \
|
||||||
|
@ -67,7 +57,6 @@ tripleo-build-images \
|
||||||
--image-config-file /usr/share/tripleo-common/image-yaml/overcloud-images.yaml \
|
--image-config-file /usr/share/tripleo-common/image-yaml/overcloud-images.yaml \
|
||||||
| jq '. | .[0].elements | map(.+" ") | add' \
|
| jq '. | .[0].elements | map(.+" ") | add' \
|
||||||
| sed 's/"//g')
|
| sed 's/"//g')
|
||||||
fi
|
|
||||||
|
|
||||||
# delorean-repo is excluded b/c we've already run --repo-setup on this node and
|
# delorean-repo is excluded b/c we've already run --repo-setup on this node and
|
||||||
# we don't want to overwrite that.
|
# we don't want to overwrite that.
|
||||||
|
@ -92,15 +81,6 @@ sudo -E instack \
|
||||||
# we have one.
|
# we have one.
|
||||||
[ -s /etc/machine-id ] || sudo -E systemd-machine-id-setup
|
[ -s /etc/machine-id ] || sudo -E systemd-machine-id-setup
|
||||||
|
|
||||||
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
|
||||||
PACKAGES=$(\
|
|
||||||
tripleo-build-images \
|
|
||||||
--image-json-output \
|
|
||||||
--image-config-file /usr/share/tripleo-common/image-yaml/overcloud-images-centos7.yaml \
|
|
||||||
--image-config-file /usr/share/tripleo-common/image-yaml/overcloud-images.yaml \
|
|
||||||
| jq '. | map(select(.imagename == "overcloud-full")) | .[0].packages | .[] | tostring' \
|
|
||||||
| sed 's/"//g')
|
|
||||||
else
|
|
||||||
PACKAGES=$(\
|
PACKAGES=$(\
|
||||||
tripleo-build-images \
|
tripleo-build-images \
|
||||||
--image-json-output \
|
--image-json-output \
|
||||||
|
@ -109,7 +89,6 @@ tripleo-build-images \
|
||||||
--image-config-file /usr/share/tripleo-common/image-yaml/overcloud-images.yaml \
|
--image-config-file /usr/share/tripleo-common/image-yaml/overcloud-images.yaml \
|
||||||
| jq '. | .[0].packages | .[] | tostring' \
|
| jq '. | .[0].packages | .[] | tostring' \
|
||||||
| sed 's/"//g')
|
| sed 's/"//g')
|
||||||
fi
|
|
||||||
|
|
||||||
# Install additional packages expected by the image
|
# Install additional packages expected by the image
|
||||||
sudo yum -y install $PACKAGES
|
sudo yum -y install $PACKAGES
|
||||||
|
|
|
@ -292,11 +292,6 @@ function postci(){
|
||||||
# Make sure zuuls log gathering can read everything in the $WORKSPACE, it also contains a
|
# Make sure zuuls log gathering can read everything in the $WORKSPACE, it also contains a
|
||||||
# link to ml2_conf.ini so this also need to be made read only
|
# link to ml2_conf.ini so this also need to be made read only
|
||||||
sudo find /etc/neutron/plugins/ml2/ml2_conf.ini $WORKSPACE -type f | sudo xargs chmod 644
|
sudo find /etc/neutron/plugins/ml2/ml2_conf.ini $WORKSPACE -type f | sudo xargs chmod 644
|
||||||
# Allow all ports before we finish up. This should avoid
|
|
||||||
# https://bugs.launchpad.net/tripleo/+bug/1649742 which we've now spent far
|
|
||||||
# too much time debugging. It's currently only happening on the mitaka
|
|
||||||
# branch anyway, so once that branch goes EOL we can probably remove this.
|
|
||||||
sudo iptables -I INPUT -p tcp -j ACCEPT
|
|
||||||
|
|
||||||
# record the size of the logs directory
|
# record the size of the logs directory
|
||||||
# -L, --dereference dereference all symbolic links
|
# -L, --dereference dereference all symbolic links
|
||||||
|
|
|
@ -150,11 +150,6 @@ sudo mkdir -p /etc/puppet/hieradata
|
||||||
|
|
||||||
if [ "$OSINFRA" = 1 ]; then
|
if [ "$OSINFRA" = 1 ]; then
|
||||||
echo "net_config_override = $TRIPLEO_ROOT/tripleo-ci/undercloud-configs/net-config-multinode.json.template" >> ~/undercloud.conf
|
echo "net_config_override = $TRIPLEO_ROOT/tripleo-ci/undercloud-configs/net-config-multinode.json.template" >> ~/undercloud.conf
|
||||||
|
|
||||||
# Use the dummy network interface if on mitaka
|
|
||||||
if [ "$STABLE_RELEASE" = "mitaka" ]; then
|
|
||||||
echo "local_interface = ci-dummy" >> ~/undercloud.conf
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If we're testing an undercloud upgrade, remove the ci repo, since we don't
|
# If we're testing an undercloud upgrade, remove the ci repo, since we don't
|
||||||
|
@ -584,8 +579,6 @@ if [ "$UNDERCLOUD_MAJOR_UPGRADE" == 1 ] ; then
|
||||||
export STABLE_RELEASE="queens"
|
export STABLE_RELEASE="queens"
|
||||||
elif [ "$STABLE_RELEASE" = "ocata" ]; then
|
elif [ "$STABLE_RELEASE" = "ocata" ]; then
|
||||||
export STABLE_RELEASE="pike"
|
export STABLE_RELEASE="pike"
|
||||||
elif [ "$STABLE_RELEASE" = "mitaka" ]; then
|
|
||||||
export STABLE_RELEASE="newton"
|
|
||||||
elif [ "$STABLE_RELEASE" = "newton" ]; then
|
elif [ "$STABLE_RELEASE" = "newton" ]; then
|
||||||
export STABLE_RELEASE="ocata"
|
export STABLE_RELEASE="ocata"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -46,10 +46,6 @@ file {"/var/www/html/builds-newton":
|
||||||
ensure => "directory",
|
ensure => "directory",
|
||||||
owner => "apache",
|
owner => "apache",
|
||||||
}
|
}
|
||||||
file {"/var/www/html/builds-mitaka":
|
|
||||||
ensure => "directory",
|
|
||||||
owner => "apache",
|
|
||||||
}
|
|
||||||
cron {"refresh-server":
|
cron {"refresh-server":
|
||||||
command => "timeout 20m puppet apply /opt/stack/tripleo-ci/scripts/mirror-server/mirror-server.pp",
|
command => "timeout 20m puppet apply /opt/stack/tripleo-ci/scripts/mirror-server/mirror-server.pp",
|
||||||
minute => "*/30"
|
minute => "*/30"
|
||||||
|
|
|
@ -36,9 +36,6 @@ function previous_release_mixed_upgrade_case {
|
||||||
ocata)
|
ocata)
|
||||||
echo "newton"
|
echo "newton"
|
||||||
;;
|
;;
|
||||||
newton)
|
|
||||||
echo "mitaka"
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
echo "UNKNOWN_RELEASE"
|
echo "UNKNOWN_RELEASE"
|
||||||
return 1
|
return 1
|
||||||
|
|
|
@ -126,12 +126,7 @@ OVERCLOUD_DEPLOY=${OVERCLOUD_DEPLOY:-""}
|
||||||
OVERCLOUD_DELETE=${OVERCLOUD_DELETE:-""}
|
OVERCLOUD_DELETE=${OVERCLOUD_DELETE:-""}
|
||||||
OVERCLOUD_DELETE_TIMEOUT=${OVERCLOUD_DELETE_TIMEOUT:-"300"}
|
OVERCLOUD_DELETE_TIMEOUT=${OVERCLOUD_DELETE_TIMEOUT:-"300"}
|
||||||
OVERCLOUD_DEPLOY_ARGS=${OVERCLOUD_DEPLOY_ARGS:-""}
|
OVERCLOUD_DEPLOY_ARGS=${OVERCLOUD_DEPLOY_ARGS:-""}
|
||||||
# --validation-errors-fatal was deprecated in newton and removed in ocata
|
OVERCLOUD_VALIDATE_ARGS=${OVERCLOUD_VALIDATE_ARGS-"--validation-warnings-fatal"}
|
||||||
if [[ "${STABLE_RELEASE}" = "mitaka" ]]; then
|
|
||||||
OVERCLOUD_VALIDATE_ARGS=${OVERCLOUD_VALIDATE_ARGS-"--validation-errors-fatal --validation-warnings-fatal"}
|
|
||||||
else
|
|
||||||
OVERCLOUD_VALIDATE_ARGS=${OVERCLOUD_VALIDATE_ARGS-"--validation-warnings-fatal"}
|
|
||||||
fi
|
|
||||||
OVERCLOUD_UPDATE=${OVERCLOUD_UPDATE:-""}
|
OVERCLOUD_UPDATE=${OVERCLOUD_UPDATE:-""}
|
||||||
OVERCLOUD_UPGRADE=${OVERCLOUD_UPGRADE:-""}
|
OVERCLOUD_UPGRADE=${OVERCLOUD_UPGRADE:-""}
|
||||||
OVERCLOUD_UPGRADE_CONVERGE=${OVERCLOUD_UPGRADE_CONVERGE:-""}
|
OVERCLOUD_UPGRADE_CONVERGE=${OVERCLOUD_UPGRADE_CONVERGE:-""}
|
||||||
|
@ -162,12 +157,7 @@ OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=${OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF:-"\
|
||||||
$REPO_PREFIX/delorean.repo \
|
$REPO_PREFIX/delorean.repo \
|
||||||
$REPO_PREFIX/delorean-current.repo \
|
$REPO_PREFIX/delorean-current.repo \
|
||||||
$REPO_PREFIX/delorean-deps.repo"}
|
$REPO_PREFIX/delorean-deps.repo"}
|
||||||
# Use Ceph/Jewel for all but mitaka
|
CEPH_RELEASE=jewel
|
||||||
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
|
||||||
CEPH_RELEASE=hammer
|
|
||||||
else
|
|
||||||
CEPH_RELEASE=jewel
|
|
||||||
fi
|
|
||||||
CEPH_REPO_FILE=centos-ceph-$CEPH_RELEASE.repo
|
CEPH_REPO_FILE=centos-ceph-$CEPH_RELEASE.repo
|
||||||
if [[ -e /etc/ci/mirror_info.sh ]]; then
|
if [[ -e /etc/ci/mirror_info.sh ]]; then
|
||||||
source /etc/ci/mirror_info.sh
|
source /etc/ci/mirror_info.sh
|
||||||
|
@ -211,9 +201,6 @@ ALT_OVERCLOUDRC=${ALT_OVERCLOUDRC:-""}
|
||||||
export SCRIPTS_DIR=$(dirname ${BASH_SOURCE[0]:-$0})
|
export SCRIPTS_DIR=$(dirname ${BASH_SOURCE[0]:-$0})
|
||||||
OVB=${OVB:-0}
|
OVB=${OVB:-0}
|
||||||
|
|
||||||
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
|
||||||
export OS_IMAGE_API_VERSION=1
|
|
||||||
fi
|
|
||||||
# Make sure we use Puppet to deploy packages on scenario upgrades jobs after ocata release
|
# Make sure we use Puppet to deploy packages on scenario upgrades jobs after ocata release
|
||||||
if [[ "${STABLE_RELEASE}" != "newton" ]] ; then
|
if [[ "${STABLE_RELEASE}" != "newton" ]] ; then
|
||||||
OVERCLOUD_UPGRADE_ARGS="$OVERCLOUD_UPGRADE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/enable_package_install.yaml "
|
OVERCLOUD_UPGRADE_ARGS="$OVERCLOUD_UPGRADE_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/enable_package_install.yaml "
|
||||||
|
@ -293,14 +280,8 @@ function repo_setup {
|
||||||
|
|
||||||
if [ "$TRIPLEO_OS_DISTRO" = "centos" ]; then
|
if [ "$TRIPLEO_OS_DISTRO" = "centos" ]; then
|
||||||
# Enable Storage/SIG Ceph repo
|
# Enable Storage/SIG Ceph repo
|
||||||
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
if rpm -q centos-release-ceph-jewel; then
|
||||||
if rpm -q centos-release-ceph-hammer; then
|
sudo yum -y erase centos-release-ceph-jewel
|
||||||
sudo yum -y erase centos-release-ceph-hammer
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if rpm -q centos-release-ceph-jewel; then
|
|
||||||
sudo yum -y erase centos-release-ceph-jewel
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
sudo /bin/bash -c "cat <<-EOF>$REPO_PREFIX/$CEPH_REPO_FILE
|
sudo /bin/bash -c "cat <<-EOF>$REPO_PREFIX/$CEPH_REPO_FILE
|
||||||
[centos-ceph-$CEPH_RELEASE]
|
[centos-ceph-$CEPH_RELEASE]
|
||||||
|
@ -451,12 +432,8 @@ function delorean_build {
|
||||||
log "Building for release $REVIEW_RELEASE"
|
log "Building for release $REVIEW_RELEASE"
|
||||||
# first check if we have a stable release
|
# first check if we have a stable release
|
||||||
sed -i -e "s%baseurl=.*%baseurl=$NODEPOOL_RDO_PROXY/centos7-$REVIEW_RELEASE%" projects.ini
|
sed -i -e "s%baseurl=.*%baseurl=$NODEPOOL_RDO_PROXY/centos7-$REVIEW_RELEASE%" projects.ini
|
||||||
if [ "$REVIEW_RELEASE" = "mitaka" ]; then
|
# RDO changed the distgit branch for stable releases starting from newton.
|
||||||
sed -i -e "s%distro=.*%distro=rpm-$REVIEW_RELEASE%" projects.ini
|
sed -i -e "s%distro=.*%distro=$REVIEW_RELEASE-rdo%" projects.ini
|
||||||
else
|
|
||||||
# RDO changed the distgit branch for stable releases starting from newton.
|
|
||||||
sed -i -e "s%distro=.*%distro=$REVIEW_RELEASE-rdo%" projects.ini
|
|
||||||
fi
|
|
||||||
sed -i -e "s%source=.*%source=stable/$REVIEW_RELEASE%" projects.ini
|
sed -i -e "s%source=.*%source=stable/$REVIEW_RELEASE%" projects.ini
|
||||||
elif [ -n "$FEATURE_BRANCH" ]; then
|
elif [ -n "$FEATURE_BRANCH" ]; then
|
||||||
# next, check if we are testing for a feature branch
|
# next, check if we are testing for a feature branch
|
||||||
|
@ -502,7 +479,7 @@ function delorean_build {
|
||||||
GITHASH=$(git rev-parse HEAD)
|
GITHASH=$(git rev-parse HEAD)
|
||||||
|
|
||||||
# Set the branches delorean reads to the same git hash as PROJ has left for us
|
# Set the branches delorean reads to the same git hash as PROJ has left for us
|
||||||
for BRANCH in master origin/master stable/mitaka origin/stable/mitaka stable/newton origin/stable/newton stable/ocata origin/stable/ocata stable/pike origin/stable/pike stable/queens origin/stable/queens; do
|
for BRANCH in master origin/master stable/newton origin/stable/newton stable/ocata origin/stable/ocata stable/pike origin/stable/pike stable/queens origin/stable/queens; do
|
||||||
git checkout -b $BRANCH || git checkout $BRANCH
|
git checkout -b $BRANCH || git checkout $BRANCH
|
||||||
git reset --hard $GITHASH
|
git reset --hard $GITHASH
|
||||||
done
|
done
|
||||||
|
@ -569,7 +546,7 @@ function overcloud_images {
|
||||||
log "Overcloud images"
|
log "Overcloud images"
|
||||||
|
|
||||||
# This hack is no longer needed in ocata.
|
# This hack is no longer needed in ocata.
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(mitaka|newton)$ ]]; then
|
if [[ "${STABLE_RELEASE}" =~ ^(newton)$ ]]; then
|
||||||
# Ensure yum-plugin-priorities is installed
|
# Ensure yum-plugin-priorities is installed
|
||||||
|
|
||||||
# get the right path for diskimage-builder version
|
# get the right path for diskimage-builder version
|
||||||
|
@ -598,7 +575,7 @@ except:
|
||||||
log "Overcloud images saved in $OVERCLOUD_IMAGES_PATH"
|
log "Overcloud images saved in $OVERCLOUD_IMAGES_PATH"
|
||||||
pushd $OVERCLOUD_IMAGES_PATH
|
pushd $OVERCLOUD_IMAGES_PATH
|
||||||
log "OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF"
|
log "OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF"
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^(mitaka|newton)$ ]] ; then
|
if [[ "${STABLE_RELEASE}" =~ ^(newton)$ ]] ; then
|
||||||
OVERCLOUD_IMAGES_ARGS="$OVERCLOUD_IMAGES_LEGACY_ARGS"
|
OVERCLOUD_IMAGES_ARGS="$OVERCLOUD_IMAGES_LEGACY_ARGS"
|
||||||
fi
|
fi
|
||||||
DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF \
|
DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF \
|
||||||
|
@ -625,18 +602,13 @@ function register_nodes {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
stackrc_check
|
stackrc_check
|
||||||
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
|
||||||
openstack baremetal import --json $INSTACKENV_JSON_PATH
|
if [ "$INTROSPECT_NODES" = 1 ]; then
|
||||||
# This step is a part of the import command from Newton on
|
# Keep the nodes in manageable state so that they may be
|
||||||
openstack baremetal configure boot
|
# introspected later.
|
||||||
|
openstack overcloud node import $INSTACKENV_JSON_PATH
|
||||||
else
|
else
|
||||||
if [ "$INTROSPECT_NODES" = 1 ]; then
|
openstack overcloud node import $INSTACKENV_JSON_PATH --provide
|
||||||
# Keep the nodes in manageable state so that they may be
|
|
||||||
# introspected later.
|
|
||||||
openstack overcloud node import $INSTACKENV_JSON_PATH
|
|
||||||
else
|
|
||||||
openstack overcloud node import $INSTACKENV_JSON_PATH --provide
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ironic node-list
|
ironic node-list
|
||||||
|
@ -651,15 +623,11 @@ function introspect_nodes {
|
||||||
|
|
||||||
stackrc_check
|
stackrc_check
|
||||||
|
|
||||||
if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then
|
# Note: Unlike the legacy bulk command, overcloud node
|
||||||
openstack baremetal introspection bulk start
|
# introspect will only run on nodes in the 'manageable'
|
||||||
else
|
# provisioning state.
|
||||||
# Note: Unlike the legacy bulk command, overcloud node
|
openstack overcloud node introspect --all-manageable
|
||||||
# introspect will only run on nodes in the 'manageable'
|
openstack overcloud node provide --all-manageable
|
||||||
# provisioning state.
|
|
||||||
openstack overcloud node introspect --all-manageable
|
|
||||||
openstack overcloud node provide --all-manageable
|
|
||||||
fi
|
|
||||||
|
|
||||||
log "Introspect nodes - DONE."
|
log "Introspect nodes - DONE."
|
||||||
|
|
||||||
|
|
|
@ -1,142 +0,0 @@
|
||||||
heat_template_version: 2013-05-23
|
|
||||||
|
|
||||||
description: >
|
|
||||||
This template resides in tripleo-ci for Mitaka CI jobs only.
|
|
||||||
For Newton and beyond, please look in THT.
|
|
||||||
HOT template to create a new neutron network plus a router to the public
|
|
||||||
network, and for deploying a server into the new network. The template also
|
|
||||||
assigns a floating IP address and sets security group rules. ADAPTED FROM
|
|
||||||
https://raw.githubusercontent.com/openstack/heat-templates/master/hot/servers_in_new_neutron_net.yaml
|
|
||||||
parameters:
|
|
||||||
key_name:
|
|
||||||
type: string
|
|
||||||
description: Name of keypair to assign to servers
|
|
||||||
default: 'pingtest_key'
|
|
||||||
image:
|
|
||||||
type: string
|
|
||||||
description: Name of image to use for servers
|
|
||||||
default: 'pingtest_image'
|
|
||||||
public_net_name:
|
|
||||||
type: string
|
|
||||||
default: 'nova'
|
|
||||||
description: >
|
|
||||||
ID or name of public network for which floating IP addresses will be allocated
|
|
||||||
private_net_name:
|
|
||||||
type: string
|
|
||||||
description: Name of private network to be created
|
|
||||||
default: 'default-net'
|
|
||||||
private_net_cidr:
|
|
||||||
type: string
|
|
||||||
description: Private network address (CIDR notation)
|
|
||||||
default: '192.168.2.0/24'
|
|
||||||
private_net_gateway:
|
|
||||||
type: string
|
|
||||||
description: Private network gateway address
|
|
||||||
default: '192.168.2.1'
|
|
||||||
private_net_pool_start:
|
|
||||||
type: string
|
|
||||||
description: Start of private network IP address allocation pool
|
|
||||||
default: '192.168.2.100'
|
|
||||||
private_net_pool_end:
|
|
||||||
type: string
|
|
||||||
default: '192.168.2.200'
|
|
||||||
description: End of private network IP address allocation pool
|
|
||||||
|
|
||||||
resources:
|
|
||||||
|
|
||||||
key_pair:
|
|
||||||
type: OS::Nova::KeyPair
|
|
||||||
properties:
|
|
||||||
save_private_key: true
|
|
||||||
name: {get_param: key_name }
|
|
||||||
|
|
||||||
private_net:
|
|
||||||
type: OS::Neutron::Net
|
|
||||||
properties:
|
|
||||||
name: { get_param: private_net_name }
|
|
||||||
|
|
||||||
private_subnet:
|
|
||||||
type: OS::Neutron::Subnet
|
|
||||||
properties:
|
|
||||||
network_id: { get_resource: private_net }
|
|
||||||
cidr: { get_param: private_net_cidr }
|
|
||||||
gateway_ip: { get_param: private_net_gateway }
|
|
||||||
allocation_pools:
|
|
||||||
- start: { get_param: private_net_pool_start }
|
|
||||||
end: { get_param: private_net_pool_end }
|
|
||||||
|
|
||||||
router:
|
|
||||||
type: OS::Neutron::Router
|
|
||||||
properties:
|
|
||||||
external_gateway_info:
|
|
||||||
network: { get_param: public_net_name }
|
|
||||||
|
|
||||||
router_interface:
|
|
||||||
type: OS::Neutron::RouterInterface
|
|
||||||
properties:
|
|
||||||
router_id: { get_resource: router }
|
|
||||||
subnet_id: { get_resource: private_subnet }
|
|
||||||
|
|
||||||
volume1:
|
|
||||||
type: OS::Cinder::Volume
|
|
||||||
properties:
|
|
||||||
name: Volume1
|
|
||||||
image: { get_param: image }
|
|
||||||
size: 1
|
|
||||||
|
|
||||||
server1:
|
|
||||||
type: OS::Nova::Server
|
|
||||||
depends_on: volume1
|
|
||||||
properties:
|
|
||||||
name: Server1
|
|
||||||
block_device_mapping:
|
|
||||||
- device_name: vda
|
|
||||||
volume_id: { get_resource: volume1 }
|
|
||||||
flavor: { get_resource: test_flavor }
|
|
||||||
key_name: { get_resource: key_pair }
|
|
||||||
networks:
|
|
||||||
- port: { get_resource: server1_port }
|
|
||||||
|
|
||||||
server1_port:
|
|
||||||
type: OS::Neutron::Port
|
|
||||||
properties:
|
|
||||||
network_id: { get_resource: private_net }
|
|
||||||
fixed_ips:
|
|
||||||
- subnet_id: { get_resource: private_subnet }
|
|
||||||
security_groups: [{ get_resource: server_security_group }]
|
|
||||||
|
|
||||||
server1_floating_ip:
|
|
||||||
type: OS::Neutron::FloatingIP
|
|
||||||
# TODO: investigate why we need this depends_on and if we could
|
|
||||||
# replace it by router_id with get_resource: router_interface
|
|
||||||
depends_on: router_interface
|
|
||||||
properties:
|
|
||||||
floating_network: { get_param: public_net_name }
|
|
||||||
port_id: { get_resource: server1_port }
|
|
||||||
|
|
||||||
server_security_group:
|
|
||||||
type: OS::Neutron::SecurityGroup
|
|
||||||
properties:
|
|
||||||
description: Add security group rules for server
|
|
||||||
name: pingtest-security-group
|
|
||||||
rules:
|
|
||||||
- remote_ip_prefix: 0.0.0.0/0
|
|
||||||
protocol: tcp
|
|
||||||
port_range_min: 22
|
|
||||||
port_range_max: 22
|
|
||||||
- remote_ip_prefix: 0.0.0.0/0
|
|
||||||
protocol: icmp
|
|
||||||
|
|
||||||
test_flavor:
|
|
||||||
type: OS::Nova::Flavor
|
|
||||||
properties:
|
|
||||||
ram: 512
|
|
||||||
vcpus: 1
|
|
||||||
|
|
||||||
outputs:
|
|
||||||
server1_private_ip:
|
|
||||||
description: IP address of server1 in private network
|
|
||||||
value: { get_attr: [ server1, first_address ] }
|
|
||||||
server1_public_ip:
|
|
||||||
description: Floating IP address of server1 in public network
|
|
||||||
value: { get_attr: [ server1_floating_ip, floating_ip_address ] }
|
|
|
@ -1,53 +0,0 @@
|
||||||
# This is for Mitaka. In newton and beyond we have a separate file for
|
|
||||||
# the endpoints so we won't need to maintain this in two repos.
|
|
||||||
parameter_defaults:
|
|
||||||
EndpointMap:
|
|
||||||
AodhAdmin: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
|
|
||||||
AodhInternal: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
|
|
||||||
AodhPublic: {protocol: 'https', port: '13042', host: 'IP_ADDRESS'}
|
|
||||||
CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
|
|
||||||
CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
|
|
||||||
CeilometerPublic: {protocol: 'https', port: '13777', host: 'IP_ADDRESS'}
|
|
||||||
CinderAdmin: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
|
|
||||||
CinderInternal: {protocol: 'http', port: '8776', host: 'IP_ADDRESS'}
|
|
||||||
CinderPublic: {protocol: 'https', port: '13776', host: 'IP_ADDRESS'}
|
|
||||||
GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
|
||||||
GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
|
||||||
GlancePublic: {protocol: 'https', port: '13292', host: 'IP_ADDRESS'}
|
|
||||||
GlanceRegistryInternal: {protocol: 'http', port: '9191', host: 'IP_ADDRESS'}
|
|
||||||
GnocchiAdmin: {protocol: 'http', port: '8041', host: 'IP_ADDRESS'}
|
|
||||||
GnocchiInternal: {protocol: 'http', port: '8041', host: 'IP_ADDRESS'}
|
|
||||||
GnocchiPublic: {protocol: 'https', port: '13041', host: 'IP_ADDRESS'}
|
|
||||||
HeatAdmin: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
|
|
||||||
HeatInternal: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
|
|
||||||
HeatPublic: {protocol: 'https', port: '13004', host: 'IP_ADDRESS'}
|
|
||||||
HeatCfnAdmin: {protocol: 'http', port: '8000', host: 'IP_ADDRESS'}
|
|
||||||
HeatCfnInternal: {protocol: 'http', port: '8000', host: 'IP_ADDRESS'}
|
|
||||||
HeatCfnPublic: {protocol: 'https', port: '13005', host: 'IP_ADDRESS'}
|
|
||||||
HorizonPublic: {protocol: 'https', port: '443', host: 'IP_ADDRESS'}
|
|
||||||
IronicAdmin: {protocol: 'http', port: '6385', host: 'IP_ADDRESS'}
|
|
||||||
IronicInternal: {protocol: 'http', port: '6385', host: 'IP_ADDRESS'}
|
|
||||||
IronicPublic: {protocol: 'https', port: '13385', host: 'IP_ADDRESS'}
|
|
||||||
KeystoneAdmin: {protocol: 'http', port: '35357', host: 'IP_ADDRESS'}
|
|
||||||
KeystoneInternal: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'}
|
|
||||||
KeystonePublic: {protocol: 'https', port: '13000', host: 'IP_ADDRESS'}
|
|
||||||
ManilaAdmin: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
|
||||||
ManilaInternal: {protocol: 'http', port: '8786', host: 'IP_ADDRESS'}
|
|
||||||
ManilaPublic: {protocol: 'https', port: '13786', host: 'IP_ADDRESS'}
|
|
||||||
MysqlInternal: {protocol: 'mysql+pymysql', port: '3306', host: 'IP_ADDRESS'}
|
|
||||||
NeutronAdmin: {protocol: 'http', port: '9696', host: 'IP_ADDRESS'}
|
|
||||||
NeutronInternal: {protocol: 'http', port: '9696', host: 'IP_ADDRESS'}
|
|
||||||
NeutronPublic: {protocol: 'https', port: '13696', host: 'IP_ADDRESS'}
|
|
||||||
NovaAdmin: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'}
|
|
||||||
NovaInternal: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'}
|
|
||||||
NovaPublic: {protocol: 'https', port: '13774', host: 'IP_ADDRESS'}
|
|
||||||
NovaVNCProxyAdmin: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
|
|
||||||
NovaVNCProxyInternal: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
|
|
||||||
NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'IP_ADDRESS'}
|
|
||||||
SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
|
|
||||||
SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
|
|
||||||
SaharaPublic: {protocol: 'https', port: '13386', host: 'IP_ADDRESS'}
|
|
||||||
SwiftAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
|
||||||
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
|
||||||
SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'}
|
|
||||||
|
|
Loading…
Reference in New Issue