Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions a-seed-from-nothing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ fi

# Clone Kayobe.
cd $HOME
[[ -d kayobe ]] || git clone https://opendev.org/openstack/kayobe.git -b stable/wallaby
[[ -d kayobe ]] || git clone https://opendev.org/openstack/kayobe.git -b stable/yoga
cd kayobe

# Bump the provisioning time - it can be lengthy on virtualised storage
Expand All @@ -89,7 +89,7 @@ sed -i.bak 's%^[# ]*wait_active_timeout:.*% wait_active_timeout: 5000%' ~/kay
# Clone this Kayobe configuration.
mkdir -p config/src
cd config/src/
[[ -d kayobe-config ]] || git clone https://github.com/stackhpc/a-universe-from-nothing.git -b stable/wallaby kayobe-config
[[ -d kayobe-config ]] || git clone https://github.com/stackhpc/a-universe-from-nothing.git -b stable/yoga kayobe-config

# Set default registry name to the one we just created
sed -i.bak 's/^docker_registry.*/docker_registry: '$registry_ip':4000/' kayobe-config/etc/kayobe/docker.yml
Expand Down
8 changes: 3 additions & 5 deletions pull-retag-push-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [ ! "$(sudo docker ps -q -f name=registry)" ]; then
sudo docker run -d -p 4000:5000 --restart=always --name registry registry
fi

tag=${1:-wallaby}
tag=${1:-yoga}
images="kolla/${DISTRO}-source-kolla-toolbox
kolla/${DISTRO}-source-haproxy
kolla/${DISTRO}-source-mariadb-server
Expand Down Expand Up @@ -70,7 +70,6 @@ kolla/${DISTRO}-source-openvswitch-db-server
kolla/${DISTRO}-source-nova-libvirt
kolla/${DISTRO}-source-memcached
kolla/${DISTRO}-source-rabbitmq
kolla/${DISTRO}-source-chrony
kolla/${DISTRO}-source-heat-api
kolla/${DISTRO}-source-heat-api-cfn
kolla/${DISTRO}-source-heat-engine
Expand All @@ -87,7 +86,6 @@ kolla/${DISTRO}-source-magnum-api
kolla/${DISTRO}-source-magnum-conductor
kolla/${DISTRO}-source-prometheus-alertmanager
kolla/${DISTRO}-source-prometheus-v2-server
kolla/${DISTRO}-source-prometheus-server
kolla/${DISTRO}-source-prometheus-cadvisor
kolla/${DISTRO}-source-prometheus-haproxy-exporter
kolla/${DISTRO}-source-prometheus-mtail
Expand All @@ -110,8 +108,8 @@ kolla/${DISTRO}-source-bifrost-deploy"

for image in $images; do
sudo docker pull $image:$tag
sudo docker tag docker.io/$image:$tag localhost:4000/$image:$tag
sudo docker push localhost:4000/$image:$tag
sudo docker tag docker.io/$image:$tag localhost:4000/openstack.$image:$tag
sudo docker push localhost:4000/openstack.$image:$tag
sudo docker image remove docker.io/$image:$tag
done

Expand Down