diff options
7 files changed, 78 insertions, 75 deletions
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk index 3e8b22345..8834d47c1 100755 --- a/mcp/config/states/dpdk +++ b/mcp/config/states/dpdk @@ -1,4 +1,6 @@ -salt -C 'I@nova:compute' system.reboot -salt -C 'I@nova:compute' test.ping +salt -I 'nova:compute' system.reboot +while true; do salt -I 'nova:compute' test.ping | fgrep -q 'Not connected' || break; done +salt -I 'nova:compute' state.sls linux.network.dpdk -salt -C 'I@nova:compute' state.sls linux +salt -I 'nova:compute' pkg.install libvirt-bin +salt -I 'nova:compute' file.chown /var/run/openvswitch libvirt-qemu kvm diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml index 3add5a4c6..59320853a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml @@ -7,19 +7,13 @@ classes: - system.reclass.storage.salt - system.salt.minion.ca.salt_master - system.salt.minion.cert.proxy -- system.keystone.client.single -- system.keystone.client.service.ceilometer -- system.keystone.client.service.nova21 -- system.keystone.client.service.nova-placement -- system.keystone.client.service.glare -- system.keystone.client.service.cinder3 - system.mysql.client.single -- system.reclass.storage.system.openstack_control_cluster - system.reclass.storage.system.openstack_compute_multi - system.reclass.storage.system.openstack_gateway_single - cluster.virtual-mcp-ocata-ovs-dpdk parameters: _param: + openstack_control_node01_hostname: ctl01 reclass_data_repository: https://gerrit.opnfv.org/gerrit/fuel reclass_data_revision: master salt_master_environment_repository: "https://github.com/tcpcloud" @@ -43,23 +37,14 @@ parameters: storage: node: openstack_control_node01: + name: ${_param:openstack_control_node01_hostname} + domain: ${_param:cluster_domain} classes: - - service.galera.master.cluster + - cluster.${_param:cluster_name}.openstack.control params: - mysql_cluster_role: master - linux_system_codename: xenial - openstack_control_node02: - classes: - - service.galera.slave.cluster - params: - mysql_cluster_role: slave - linux_system_codename: xenial - openstack_control_node03: - classes: - - service.galera.slave.cluster - params: - mysql_cluster_role: slave linux_system_codename: xenial + salt_master_host: ${_param:reclass_config_master} + single_address: ${_param:openstack_control_node01_address} openstack_compute_node01: params: single_address: 172.16.10.105 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml index d26d4018d..0b6cce7c6 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml @@ -10,7 +10,7 @@ parameters: # infra service addresses infra_config_address: 172.16.10.100 # openstack service addresses - openstack_control_address: 172.16.10.254 + openstack_control_address: 172.16.10.101 openstack_control_node01_address: 172.16.10.101 openstack_control_node02_address: 172.16.10.102 openstack_control_node03_address: 172.16.10.103 @@ -20,3 +20,4 @@ parameters: openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} openstack_gateway_address: 172.16.10.110 + control_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml index b8fadb932..e4777fe0d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml @@ -2,11 +2,13 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial -- system.nova.compute.cluster -- system.neutron.compute.cluster -- system.ceilometer.agent.cluster +- system.linux.storage.loopback +- system.nova.compute.single - system.nova.compute.nfv.hugepages +- service.neutron.compute.single - system.neutron.compute.nfv.dpdk +- service.cinder.volume.single +- system.cinder.volume.backend.lvm - cluster.virtual-mcp-ocata-ovs-dpdk parameters: _param: @@ -15,14 +17,24 @@ parameters: external_interface: ens6 interface_mtu: 9000 linux_system_codename: xenial + loopback_device_size: 10 nova: compute: vncproxy_url: http://${_param:cluster_vip_address}:6080 + network: + region: ${_param:openstack_region} + user: neutron + tenant: service + password: ${_param:keystone_neutron_password} + neutron: + compute: + agent_mode: ${_param:neutron_compute_agent_mode} message_queue: - members: - - host: ${_param:openstack_control_node01_address} - - host: ${_param:openstack_control_node02_address} - - host: ${_param:openstack_control_node03_address} + host: ${_param:openstack_control_address} + metadata: + host: ${_param:openstack_control_address} + backend: + tenant_network_types: ${_param:neutron_tenant_network_types} linux: network: bridge: openvswitch diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml index 3ec111b0b..0372906da 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml @@ -1,44 +1,35 @@ classes: - system.linux.system.lowmem -- system.linux.system.repo.glusterfs - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial -- system.ceilometer.client - system.memcached.server.single -- system.rabbitmq.server.cluster +- system.rabbitmq.server.single - system.rabbitmq.server.vhost.openstack - system.keystone.server.wsgi -- system.keystone.server.cluster -- system.glusterfs.client.cluster -- system.glusterfs.client.volume.glance -- system.glusterfs.client.volume.keystone -- system.glusterfs.server.volume.glance -- system.glusterfs.server.volume.keystone -- system.glusterfs.server.cluster -- system.glance.control.cluster -- system.nova.control.cluster -- system.neutron.control.openvswitch.cluster -- system.cinder.control.cluster -- system.heat.server.cluster -- system.galera.server.cluster -- system.galera.server.database.aodh -- system.galera.server.database.ceilometer +- system.keystone.server.single +- system.keystone.client.single +- system.keystone.client.service.nova21 +- system.keystone.client.service.nova-placement +- system.keystone.client.service.glare +- system.keystone.client.service.cinder3 +- system.glance.control.single +- system.nova.control.single +- system.neutron.control.openvswitch.single +- system.cinder.control.single +- system.cinder.control.backend.lvm +- system.heat.server.single +- service.mysql.server.single - system.galera.server.database.cinder - system.galera.server.database.glance - system.galera.server.database.grafana - system.galera.server.database.heat - system.galera.server.database.keystone - system.galera.server.database.nova -- system.haproxy.proxy.listen.openstack.nova-placement -- system.ceilometer.server.cluster -- system.aodh.server.cluster -- system.horizon.server.cluster +- system.horizon.server.single - cluster.virtual-mcp-ocata-ovs-dpdk parameters: _param: - keepalived_vip_interface: ens4 - keepalived_openstack_telemetry_vip_interface: ens4 linux_system_codename: xenial linux: system: @@ -53,14 +44,20 @@ parameters: proto: static address: ${_param:single_address} netmask: 255.255.255.0 - keepalived: - cluster: - instance: - VIP: - virtual_router_id: 150 keystone: server: admin_email: ${_param:admin_email} + pkgs: + - keystone + - python-keystone + - python-keystoneclient + - python-psycopg2 + - python-mysqldb + - python-six + - python-memcache + - python-openstackclient + - gettext-base + - python-pycadf glance: server: storage: @@ -79,3 +76,12 @@ parameters: novncproxy_port: 6080 vncproxy_url: http://${_param:cluster_vip_address}:6080 workers: 1 + neutron: + server: + backend: + tenant_vlan_range: 1000:1999 + mysql: + server: + version: '5.7' + bind: + address: ${_param:cluster_local_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml index 64e2245cb..e102c10b3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml @@ -2,7 +2,7 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial -- system.neutron.gateway.cluster +- service.neutron.gateway.single - cluster.virtual-mcp-ocata-ovs-dpdk parameters: _param: @@ -11,6 +11,11 @@ parameters: external_interface: ens6 interface_mtu: 9000 linux_system_codename: xenial + neutron: + gateway: + agent_mode: ${_param:neutron_gateway_agent_mode} + backend: + tenant_network_types: ${_param:neutron_tenant_network_types} linux: network: bridge: openvswitch diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml index b56a5a2fb..5f40a1d1e 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml @@ -6,11 +6,11 @@ parameters: openstack_region: RegionOne admin_email: root@localhost cluster_public_protocol: http - cluster_public_host: 172.16.10.254 + cluster_public_host: 172.16.10.101 neutron_public_protocol: http neutron_control_dvr: False - neutron_tenant_network_types: "flat" - neutron_l3_ha: True + neutron_tenant_network_types: "flat,vlan" + neutron_l3_ha: False neutron_global_physnet_mtu: 1500 neutron_external_mtu: 1500 neutron_gateway_dvr: False @@ -31,6 +31,8 @@ parameters: compute_ovs_dpdk_socket_mem: "1024" compute_ovs_dpdk_lcore_mask: "0x1" compute_ovs_memory_channels: "2" + cluster_vip_address: ${_param:cluster_public_host} + cluster_local_address: ${_param:openstack_control_address} cluster_node01_hostname: ctl01 cluster_node01_address: 172.16.10.101 cluster_node02_hostname: ctl02 @@ -108,16 +110,6 @@ parameters: names: - ctl01 - ctl01.${_param:cluster_domain} - ctl02: - address: ${_param:openstack_control_node02_address} - names: - - ctl02 - - ctl02.${_param:cluster_domain} - ctl03: - address: ${_param:openstack_control_node03_address} - names: - - ctl03 - - ctl03.${_param:cluster_domain} gtw01: address: ${_param:openstack_gateway_address} names: |