Skip to content

Commit 14c643f

Browse files
author
scrungus
committed
add new flavor, type and octavia_tag
1 parent dc7d1a8 commit 14c643f

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

etc/kayobe/ansible/scripts/aio-magnum-init.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ fi
1414
if ! $KOLLA_OPENSTACK_COMMAND flavor list | grep -q ds2G20; then
1515
echo Creating flavor ds2G20 for ubuntu image
1616
$KOLLA_OPENSTACK_COMMAND flavor create ds2G20 --ram 2048 --disk 20 --id d5 --vcpus 2 --public
17+
$KOLLA_OPENSTACK_COMMAND flavor create ds4G20 --ram 4096 --disk 20 --id d6 --vcpus 4 --public
1718
fi
1819

19-
20+
$KOLLA_OPENSTACK_COMMAND flavor create ds2G20 --ram 2048 --disk 20 --id d5 --vcpus 2 --public
2021
if ! $KOLLA_OPENSTACK_COMMAND image list | grep -q ubuntu-2004-kube-v1.26.0; then
2122
echo Downloading ubuntu k8s image..
2223

@@ -36,8 +37,9 @@ if ! $KOLLA_OPENSTACK_COMMAND image list | grep -q ubuntu-2004-kube-v1.26.0; the
3637
--external-network public1 \
3738
--label kube_tag=v1.26.3 \
3839
--label octavia_provider=ovn \
39-
--master-flavor ds2G20 \
40-
--flavor ds2G20 \
40+
--label dns_nameserver=8.8.8.8 \
41+
--master-flavor ds4G20 \
42+
--flavor ds4G20 \
4143
--public \
4244
--master-lb-enabled
4345

@@ -78,4 +80,4 @@ fi
7880
# eval sudo ip r add $SUBNET_CIDR via $ROUTER_IP
7981
# fi
8082

81-
touch /tmp/.init-runonce-mgm
83+
touch /tmp/.init-runonce-mgm

etc/kayobe/environments/ci-capi-aio/stackhpc-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ stackhpc_repo_ubuntu_focal_version: "{{ stackhpc_pulp_repo_ubuntu_focal_version
5353
stackhpc_repo_ubuntu_focal_security_version: "{{ stackhpc_pulp_repo_ubuntu_focal_security_version }}"
5454
stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"
5555
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
56-
stackhpc_repo_centos_stream_9_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream__openstack_yoga_version }}"
56+
stackhpc_repo_centos_stream_9_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version }}"
5757
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
5858
stackhpc_repo_centos_stream_9_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version }}"
5959
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

etc/kayobe/kolla/globals.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts.os_family == 'Debian' }}"{% endraw %}
88

99
neutron_tag: yoga-20230515T150233
10+
octavia_tag: yoga-20230523T110936
1011
openvswitch_tag: yoga-20230515T150233
1112
ovn_tag: yoga-20230515T150233
1213

0 commit comments

Comments
 (0)