Merge "Pre-setup provider gateway using deploy-env role"

This commit is contained in:
Zuul 2024-03-27 04:03:53 +00:00 committed by Gerrit Code Review
commit a53aaf9aa1
6 changed files with 29 additions and 9 deletions

View File

@ -21,6 +21,14 @@ parameters:
type: string type: string
default: 172.24.4.1 default: 172.24.4.1
allocation_pool_start:
type: string
default: 172.24.4.10
allocation_pool_end:
type: string
default: 172.24.4.254
resources: resources:
public_net: public_net:
type: OS::Neutron::ProviderNet type: OS::Neutron::ProviderNet
@ -45,4 +53,7 @@ resources:
get_param: subnet_gateway get_param: subnet_gateway
enable_dhcp: false enable_dhcp: false
dns_nameservers: dns_nameservers:
- 10.96.0.10 - get_param: subnet_gateway
allocation_pools:
- start: {get_param: allocation_pool_start}
end: {get_param: allocation_pool_end}

View File

@ -37,6 +37,8 @@ export OPENSTACK_CLIENT_CONTAINER_EXTRA_ARGS
: ${OSH_EXT_SUBNET_NAME:="public-subnet"} : ${OSH_EXT_SUBNET_NAME:="public-subnet"}
: ${OSH_EXT_SUBNET:="172.24.4.0/24"} : ${OSH_EXT_SUBNET:="172.24.4.0/24"}
: ${OSH_BR_EX_ADDR:="172.24.4.1/24"} : ${OSH_BR_EX_ADDR:="172.24.4.1/24"}
: ${OSH_ALLOCATION_POOL_START:="172.24.4.10"}
: ${OSH_ALLOCATION_POOL_END:="172.24.4.254"}
openstack stack show "heat-public-net-deployment" || \ openstack stack show "heat-public-net-deployment" || \
openstack stack create --wait \ openstack stack create --wait \
--parameter network_name=${OSH_EXT_NET_NAME} \ --parameter network_name=${OSH_EXT_NET_NAME} \
@ -44,6 +46,8 @@ openstack stack show "heat-public-net-deployment" || \
--parameter subnet_name=${OSH_EXT_SUBNET_NAME} \ --parameter subnet_name=${OSH_EXT_SUBNET_NAME} \
--parameter subnet_cidr=${OSH_EXT_SUBNET} \ --parameter subnet_cidr=${OSH_EXT_SUBNET} \
--parameter subnet_gateway=${OSH_BR_EX_ADDR%/*} \ --parameter subnet_gateway=${OSH_BR_EX_ADDR%/*} \
--parameter allocation_pool_start=${OSH_ALLOCATION_POOL_START} \
--parameter allocation_pool_end=${OSH_ALLOCATION_POOL_END} \
-t ${HEAT_DIR}/heat-public-net-deployment.yaml \ -t ${HEAT_DIR}/heat-public-net-deployment.yaml \
heat-public-net-deployment heat-public-net-deployment

View File

@ -36,7 +36,7 @@ neutron:
enabled: true enabled: true
network: network:
interface: interface:
tunnel: docker0 tunnel: null
conf: conf:
neutron: neutron:
DEFAULT: DEFAULT:
@ -44,6 +44,10 @@ neutron:
max_l3_agents_per_router: 1 max_l3_agents_per_router: 1
l3_ha_network_type: vxlan l3_ha_network_type: vxlan
dhcp_agents_per_network: 1 dhcp_agents_per_network: 1
# provider1 is a tap interface used by default in the test env
# we create this interface while setting up the test env
auto_bridge_add:
br-ex: provider1
plugins: plugins:
ml2_conf: ml2_conf:
ml2_type_flat: ml2_type_flat:
@ -56,6 +60,11 @@ neutron:
linuxbridge_agent: linuxbridge_agent:
linux_bridge: linux_bridge:
bridge_mappings: public:br-ex bridge_mappings: public:br-ex
labels:
agent:
l3:
node_selector_key: l3-agent
node_selector_value: enabled
EOF EOF
## includes second argument 'subchart' to indicate a different path ## includes second argument 'subchart' to indicate a different path
export HELM_CHART_ROOT_PATH="../openstack-helm/openstack" export HELM_CHART_ROOT_PATH="../openstack-helm/openstack"

View File

@ -26,6 +26,7 @@ helm upgrade --install rabbitmq ${HELM_CHART_ROOT_PATH}/rabbitmq \
--namespace=openstack \ --namespace=openstack \
--set volume.enabled=false \ --set volume.enabled=false \
--set pod.replicas.server=1 \ --set pod.replicas.server=1 \
--timeout=600s \
${OSH_EXTRA_HELM_ARGS:=} \ ${OSH_EXTRA_HELM_ARGS:=} \
${OSH_EXTRA_HELM_ARGS_RABBITMQ} ${OSH_EXTRA_HELM_ARGS_RABBITMQ}

View File

@ -34,7 +34,7 @@ network:
conf: conf:
ovn_bridge_mappings: public:br-ex ovn_bridge_mappings: public:br-ex
auto_bridge_add: auto_bridge_add:
br-ex: null br-ex: provider1
EOF EOF
#NOTE: Deploy command #NOTE: Deploy command

View File

@ -65,6 +65,7 @@
zuul_osh_infra_relative_path: ../openstack-helm-infra zuul_osh_infra_relative_path: ../openstack-helm-infra
gate_scripts_relative_path: ../openstack-helm gate_scripts_relative_path: ../openstack-helm
run_helm_tests: "no" run_helm_tests: "no"
openstack_provider_gateway_setup: true
- job: - job:
name: openstack-helm-compute-kit name: openstack-helm-compute-kit
@ -88,7 +89,6 @@
- ./tools/deployment/common/run-helm-tests.sh nova - ./tools/deployment/common/run-helm-tests.sh nova
- ./tools/deployment/common/run-helm-tests.sh glance - ./tools/deployment/common/run-helm-tests.sh glance
- ./tools/deployment/common/run-helm-tests.sh keystone - ./tools/deployment/common/run-helm-tests.sh keystone
- ./tools/deployment/common/setup-gateway.sh
- ./tools/deployment/common/use-it.sh - ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh - ./tools/deployment/common/force-cronjob-run.sh
@ -115,7 +115,6 @@
- ./tools/deployment/common/run-helm-tests.sh nova - ./tools/deployment/common/run-helm-tests.sh nova
- ./tools/deployment/common/run-helm-tests.sh glance - ./tools/deployment/common/run-helm-tests.sh glance
- ./tools/deployment/common/run-helm-tests.sh keystone - ./tools/deployment/common/run-helm-tests.sh keystone
- ./tools/deployment/common/setup-gateway.sh
- ./tools/deployment/common/use-it.sh - ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh - ./tools/deployment/common/force-cronjob-run.sh
@ -199,7 +198,6 @@
- ^tools/deployment/common/setup-client.sh$ - ^tools/deployment/common/setup-client.sh$
- ^tools/deployment/component/common/ingress.sh$ - ^tools/deployment/component/common/ingress.sh$
- ^tools/deployment/component/common/openstack.sh$ - ^tools/deployment/component/common/openstack.sh$
- ^tools/deployment/common/setup-gateway.sh$
- ^tools/deployment/common/use-it.sh$ - ^tools/deployment/common/use-it.sh$
- ^tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh$ - ^tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh$
- ^tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh$ - ^tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh$
@ -211,7 +209,6 @@
- ./tools/deployment/common/setup-client.sh - ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/ingress.sh - ./tools/deployment/common/ingress.sh
- export GLANCE_BACKEND=memory; ./tools/deployment/component/common/openstack.sh - export GLANCE_BACKEND=memory; ./tools/deployment/component/common/openstack.sh
- ./tools/deployment/common/setup-gateway.sh
- - ./tools/deployment/common/use-it.sh - - ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh - ./tools/deployment/common/force-cronjob-run.sh
- ./tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh - ./tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh
@ -263,7 +260,6 @@
./tools/deployment/common/run-helm-tests.sh glance; ./tools/deployment/common/run-helm-tests.sh glance;
./tools/deployment/common/run-helm-tests.sh keystone; ./tools/deployment/common/run-helm-tests.sh keystone;
./tools/deployment/common/run-helm-tests.sh cinder; ./tools/deployment/common/run-helm-tests.sh cinder;
- ./tools/deployment/common/setup-gateway.sh
- - ./tools/deployment/common/use-it.sh - - ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh - ./tools/deployment/common/force-cronjob-run.sh
@ -315,7 +311,6 @@
- ./tools/deployment/component/compute-kit/openvswitch.sh - ./tools/deployment/component/compute-kit/openvswitch.sh
- ./tools/deployment/component/compute-kit/libvirt.sh - ./tools/deployment/component/compute-kit/libvirt.sh
- ./tools/deployment/component/compute-kit/compute-kit.sh - ./tools/deployment/component/compute-kit/compute-kit.sh
- ./tools/deployment/common/setup-gateway.sh
- ./tools/deployment/component/horizon/horizon.sh - ./tools/deployment/component/horizon/horizon.sh
- ./tools/deployment/common/openstack-exporter.sh - ./tools/deployment/common/openstack-exporter.sh
- ./tools/deployment/common/use-it.sh - ./tools/deployment/common/use-it.sh