diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f3d0e91..ca4468a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v4.2.0 hooks: - id: check-added-large-files - id: check-byte-order-marker diff --git a/Vagrantfile b/Vagrantfile index f022c94..aa54612 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -29,7 +29,7 @@ PROVISION_PLAYBOOK = ENV.fetch( PROVISION_DIR = File.dirname(PROVISION_PLAYBOOK) # Host IP address to be assigned to OpenStack in DevStack -HOST_IP = "192.168.33.10" +HOST_IP = "192.168.56.10" # Local directory from where look for required projects files PROJECTS_DIR = File.dirname(ENV.fetch('PROJECTS_DIR', VAGRANTFILE_DIR)) diff --git a/playbooks/vagrant/designate/local.conf b/playbooks/vagrant/designate/local.conf index 1da17ca..d463c80 100644 --- a/playbooks/vagrant/designate/local.conf +++ b/playbooks/vagrant/designate/local.conf @@ -57,7 +57,7 @@ disable_service q-l3 disable_service q-dhcp disable_service q-meta -HOST_IP=192.168.33.10 +HOST_IP=192.168.56.10 IP_VERSION=4 # ENABLE_CHASSIS_AS_GW=true diff --git a/playbooks/vagrant/octavia/local.conf b/playbooks/vagrant/octavia/local.conf index d7ea23f..0a0986f 100644 --- a/playbooks/vagrant/octavia/local.conf +++ b/playbooks/vagrant/octavia/local.conf @@ -47,7 +47,7 @@ enable_service q-trunk enable_service q-dns #enable_service q-qos -HOST_IP=192.168.33.10 +HOST_IP=192.168.56.10 IP_VERSION=4 # Q_PLUGIN=ml2 Q_AGENT=ovn diff --git a/playbooks/vagrant/ovn/local.conf b/playbooks/vagrant/ovn/local.conf index 4d31eec..e62e9c8 100644 --- a/playbooks/vagrant/ovn/local.conf +++ b/playbooks/vagrant/ovn/local.conf @@ -57,7 +57,7 @@ disable_service q-l3 disable_service q-dhcp disable_service q-meta -HOST_IP=192.168.33.10 +HOST_IP=192.168.56.10 IP_VERSION=4 # ENABLE_CHASSIS_AS_GW=true diff --git a/playbooks/vagrant/ovs-dvr/local.conf b/playbooks/vagrant/ovs-dvr/local.conf new file mode 100644 index 0000000..5234650 --- /dev/null +++ b/playbooks/vagrant/ovs-dvr/local.conf @@ -0,0 +1,101 @@ +[[local|localrc]] +ADMIN_PASSWORD=secret +DATABASE_PASSWORD=$ADMIN_PASSWORD +KEYSTONE_ADMIN_ENDPOINT=true +RABBIT_PASSWORD=$ADMIN_PASSWORD +SERVICE_PASSWORD=$ADMIN_PASSWORD + +LOGFILE=/opt/stack/devstack/stack.log +VERBOSE=True +LOG_COLOR=True + +# Enable required services ---------------------------------------------------- +enable_service key +enable_service mysql +enable_service placement-api +enable_service placement-client +enable_service rabbit + +# Disable unrequired services ------------------------------------------------- +disable_service horizon +disable_service tempest + +# Configure Nova -------------------------------------------------------------- +enable_service n-api +enable_service n-api-meta +enable_service n-cond +enable_service n-cpu +enable_service n-crt +enable_service n-sch +enable_service n-sproxy + +# Configure Neutron ----------------------------------------------------------- +enable_plugin neutron https://opendev.org/openstack/neutron.git +enable_service neutron +enable_service q-agt +enable_service q-dhcp +enable_service q-l3 +enable_service q-log +enable_service q-meta +enable_service q-qos +enable_service q-svc + +HOST_IP=192.168.56.10 +IP_VERSION=4 +Q_PLUGIN=ml2 +Q_AGENT=openvswitch +Q_ML2_PLUGIN_MECHANISM_DRIVERS=openvswitch +Q_ML2_PLUGIN_TYPE_DRIVERS=vlan,flat,local +Q_ML2_TENANT_NETWORK_TYPE=vlan +# ENABLE_TENANT_TUNNELS=True +ENABLE_TENANT_VLANS=True + + +# Configure Glance ------------------------------------------------------------ +enable_service g-api + +# Configure Cinder ------------------------------------------------------------ +enable_service c-api +enable_service c-sch +enable_service c-vol + +# Configure Heat -------------------------------------------------------------- +enable_plugin heat https://opendev.org/openstack/heat.git + +# Configure Tobiko ------------------------------------------------------------ +enable_plugin devstack-plugin-tobiko https://opendev.org/x/devstack-plugin-tobiko.git + +TOBIKO_NEUTRON_IPV4_DNS_NAMESERVERS=1.1.1.1,8.8.8.8 + + +# Settings for DVR networking ------------------------------------------------- + +[[post-config|$NEUTRON_CONF]] +[DEFAULT] +router_distributed=True + +[[post-config|/$Q_PLUGIN_CONF_FILE]] +[ml2] +type_drivers=flat,vlan,vxlan +tenant_network_types=vxlan +mechanism_drivers=openvswitch,l2population + +[ml2_type_vxlan] +vni_ranges=1000:1999 + +[ovs] +local_ip=$HOST_IP + +[agent] +tunnel_types=vxlan +l2_population=True +enable_distributed_routing=True + +[[post-config|$Q_L3_CONF_FILE]] +[DEFAULT] +agent_mode=dvr_snat +router_delete_namespaces=True + +[[post-config|$Q_DHCP_CONF_FILE]] +[DEFAULT] +dhcp_delete_namespaces=True diff --git a/playbooks/vagrant/ovs-octavia/local.conf b/playbooks/vagrant/ovs-octavia/local.conf index 62a4d43..f249e90 100644 --- a/playbooks/vagrant/ovs-octavia/local.conf +++ b/playbooks/vagrant/ovs-octavia/local.conf @@ -36,10 +36,12 @@ enable_service neutron enable_service q-agt enable_service q-dhcp enable_service q-l3 +enable_service q-log enable_service q-meta +enable_service q-qos enable_service q-svc -HOST_IP=192.168.33.10 +HOST_IP=192.168.56.10 IP_VERSION=4 Q_PLUGIN=ml2 Q_AGENT=openvswitch diff --git a/playbooks/vagrant/ovs/local.conf b/playbooks/vagrant/ovs/local.conf index d9c8342..5763d03 100644 --- a/playbooks/vagrant/ovs/local.conf +++ b/playbooks/vagrant/ovs/local.conf @@ -40,7 +40,7 @@ enable_service q-meta enable_service q-qos enable_service q-svc -HOST_IP=192.168.33.10 +HOST_IP=192.168.56.10 IP_VERSION=4 Q_PLUGIN=ml2 Q_AGENT=openvswitch