From 5233864f5aebd3c6b17c47a3725223e3bb4ae0f3 Mon Sep 17 00:00:00 2001 From: Glenn Date: Thu, 13 Apr 2023 00:54:43 +0200 Subject: [PATCH] fix: Change openstack config --- vagrant--devstack/Vagrantfile | 5 +- vagrant--devstack/provision/openstack.sh | 60 ++++++++++++++++++++---- 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/vagrant--devstack/Vagrantfile b/vagrant--devstack/Vagrantfile index 79e43a0..c7e0c29 100644 --- a/vagrant--devstack/Vagrantfile +++ b/vagrant--devstack/Vagrantfile @@ -29,7 +29,10 @@ Vagrant.configure('2') do |config| end machine.vm.network 'forwarded_port', guest: 80, host: 1080, host_ip: '127.0.0.1' # machine.vm.network "public_network", bridge: 'dummy0', auto_config: false - machine.vm.network "public_network", dev: "br25", type: "bridge", auto_config: false + # machine.vm.network "public_network", dev: "br25", type: "bridge", auto_config: false + machine.vm.network "private_network", ip: "192.168.56.21", name: "vagrant0" + machine.vm.network "private_network", ip: "192.168.57.21", name: "vagrant1" + machine.vm.network "private_network", ip: "192.168.58.21", name: "vagrant2" end config.vm.provision 'shell', name: 'provision/base', path: 'provision/base.sh', privileged: true diff --git a/vagrant--devstack/provision/openstack.sh b/vagrant--devstack/provision/openstack.sh index 8acb47d..d57a250 100755 --- a/vagrant--devstack/provision/openstack.sh +++ b/vagrant--devstack/provision/openstack.sh @@ -40,16 +40,58 @@ cd devstack || exit 1 ## cat > local.conf <<-MARK [[local|localrc]] -HOST_IP=172.16.0.1 -FLAT_INTERFACE=br25 -PUBLIC_INTERFACE=eth1 -FLOATING_RANGE=172.16.0.128/25 -FIXED_RANGE=10.11.12.0/24 -ADMIN_PASSWORD=admin1pass -DATABASE_PASSWORD=database2pass -RABBIT_PASSWORD=rabbit3pass -SERVICE_PASSWORD=service4pass +## Pull changes from upstream on next run on stack.sh +RECLONE=True + +HOST_IP=192.168.56.21 +SERVICE_HOST=192.168.56.21 +MYSQL_HOST=192.168.56.21 +RABBIT_HOST=192.168.56.21 +GLANCE_HOSTPORT=192.168.56.21:9292 + +ADMIN_PASSWORD=adminsecret +DATABASE_PASSWORD=databasesecret +RABBIT_PASSWORD=rabbitsecret +SERVICE_PASSWORD=servicesecret + +## Do not use Nova-Network +disable_service n-net + +## Enable Neutron +ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,neutron + +## Neutron options +Q_USE_SECGROUP=True +FLOATING_RANGE="192.168.56.0/24" +FIXED_RANGE="10.0.0.0/24" +Q_FLOATING_ALLOCATION_POOL=start=192.168.56.240,end=192.168.56.254 +PUBLIC_NETWORK_GATEWAY="192.168.56.1" +PUBLIC_INTERFACE=eth1 + +## Open vSwitch provider networking configuration +Q_USE_PROVIDERNET_FOR_PUBLIC=True +OVS_PHYSICAL_BRIDGE=br-ex +PUBLIC_BRIDGE=br-ex +OVS_BRIDGE_MAPPINGS=public:br-ex + +## Additionnal SM added +GIT_BASE=$(GIT_BASE:-https://opendev.org) +# FIXME: broken because of mysql +# enable_plugin tacker https://opendev.org/openstack/tacker master + +## Enable heat plugin +ENABLED_SERVICES+=,h-eng,h-api,h-api-cfn,h-api-cw +enable_plugin heat https://opendev.org/openstack/heat master + +## Disable tempest +disable_service tempest + +## Enable mistral +enable_plugin mistral https://opendev.org/openstack/mistral + +## Enable designate +enable_plugin designate https://opendev.org/openstack/designate MARK ##