diff options
Diffstat (limited to 'mcp/reclass/classes/cluster')
21 files changed, 423 insertions, 1366 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml index e63e9d5c9..f4ad1bfc2 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml @@ -164,3 +164,25 @@ parameters: host: ${_param:cluster_node01_address} port: 8775 params: ${_param:haproxy_check} + ceilometer_api: + type: general-service + check: false + binds: + - address: ${_param:cluster_vip_address} + port: 8777 + servers: + - name: ${_param:cluster_node01_hostname} + host: ${_param:cluster_node01_address} + port: 8777 + params: ${_param:haproxy_check} + aodh-api: + type: openstack-service + service_name: aodh + binds: + - address: ${_param:cluster_vip_address} + port: 8042 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8042 + params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml new file mode 100644 index 000000000..0cb7ccb01 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml @@ -0,0 +1,76 @@ +classes: +- system.linux.system.repo.mcp.openstack +- system.linux.system.repo.mcp.extra +- system.linux.system.repo.saltstack.xenial +- system.linux.storage.loopback +- system.nova.compute.single +- service.neutron.compute.single +- service.cinder.volume.single +- system.cinder.volume.backend.lvm +- system.ceilometer.agent.cluster +- system.ceilometer.client.nova_compute +- system.ceilometer.client.cinder_volume +parameters: + _param: + primary_interface: ens4 + tenant_interface: ens5 + 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: + notification: true + agent_mode: ${_param:neutron_compute_agent_mode} + message_queue: + host: ${_param:openstack_control_address} + metadata: + host: ${_param:openstack_control_address} + cinder: + volume: + database: + host: ${_param:cluster_local_address} + identity: + host: ${_param:cluster_local_address} + glance: + host: ${_param:cluster_local_address} + message_queue: + host: ${_param:cluster_local_address} + linux: + network: + bridge: openvswitch + interface: + dhcp_int: + enabled: true + name: ens3 + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} + primary_interface: + enabled: true + name: ${_param:primary_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + tenant_interface: + enabled: true + name: ${_param:tenant_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + br-mgmt: + enabled: true + type: bridge + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:primary_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml new file mode 100644 index 000000000..0927900cb --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml @@ -0,0 +1,112 @@ +classes: +- system.linux.system.lowmem +- system.linux.system.repo.mcp.openstack +- system.linux.system.repo.mcp.extra +- system.linux.system.repo.saltstack.xenial +- system.mongodb.server.single +- system.mongodb.server.database.ceilometer +- system.ceilometer.client +- system.ceilometer.client.neutron +- system.memcached.server.single +- system.rabbitmq.server.single +- system.rabbitmq.server.vhost.openstack +- system.keystone.server.wsgi +- 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.keystone.client.service.ceilometer +- system.keystone.client.service.aodh +- system.glance.control.single +- system.nova.control.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.galera.server.database.ceilometer +- system.galera.server.database.aodh +- service.ceilometer.server.single +- system.aodh.server.single +- system.horizon.server.single +- service.haproxy.proxy.single +- cluster.virtual-mcp-ocata-common.haproxy_openstack_api +parameters: + _param: + linux_system_codename: xenial + linux: + system: + package: + python-msgpack: + version: latest + network: + interface: + ens4: + enabled: true + type: eth + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + ens6: + enabled: true + type: eth + proto: static + address: ${_param:cluster_public_host} + netmask: 255.255.255.0 + 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: + engine: file + images: [] + workers: 1 + nova: + controller: + networking: dvr + cpu_allocation: 54 + metadata: + password: ${_param:metadata_password} + bind: + private_address: ${_param:cluster_local_address} + public_address: ${_param:cluster_vip_address} + novncproxy_port: 6080 + vncproxy_url: http://${_param:cluster_vip_address}:6080 + workers: 1 + heat: + server: + bind: + api_cfn: + address: ${_param:single_address} + api_cloudwatch: + address: ${_param:single_address} + mysql: + server: + version: '5.7' + bind: + address: ${_param:cluster_local_address} + mongodb: + server: + bind: + address: ${_param:cluster_local_address},127.0.0.1 + logging: + verbose: v diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml new file mode 100644 index 000000000..926259023 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml @@ -0,0 +1,71 @@ +classes: +- system.linux.system.repo.mcp.openstack +- system.linux.system.repo.mcp.extra +- system.linux.system.repo.saltstack.xenial +parameters: + _param: + primary_interface: ens4 + tenant_interface: ens5 + external_interface: ens6 + interface_mtu: 9000 + linux_system_codename: xenial + neutron: + gateway: + notification: true + agent_mode: ${_param:neutron_gateway_agent_mode} + linux: + network: + bridge: openvswitch + interface: + dhcp_int: + enabled: true + name: ens3 + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} + primary_interface: + enabled: true + name: ${_param:primary_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + tenant_interface: + enabled: true + name: ${_param:tenant_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + external_interface: + enabled: true + name: ${_param:external_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + br-floating: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} + br-mgmt: + enabled: true + type: bridge + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + mtu: ${_param:interface_mtu} + use_interfaces: + - ${_param:primary_interface} + float-to-ex: + enabled: true + type: ovs_port + mtu: ${_param:interface_mtu} + bridge: br-floating + br-ex: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + address: ${_param:external_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:external_interface} + use_ovs_ports: + - float-to-ex diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml new file mode 100644 index 000000000..a14a7113a --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml @@ -0,0 +1,122 @@ +parameters: + _param: + openstack_version: ocata + apt_mk_version: nightly + mcp_repo_version: 1.1 + openstack_region: RegionOne + admin_email: root@localhost + cluster_public_protocol: http + cluster_public_host: 10.16.0.101 + neutron_public_protocol: http + neutron_control_dvr: False + neutron_l3_ha: False + neutron_global_physnet_mtu: 1500 + neutron_external_mtu: 1500 + neutron_gateway_dvr: False + neutron_gateway_agent_mode: legacy + neutron_compute_dvr: False + neutron_compute_agent_mode: legacy + neutron_compute_external_access: False + galera_server_cluster_name: openstack_cluster + galera_server_maintenance_password: opnfv_secret + galera_server_admin_password: opnfv_secret + 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 + cluster_node02_address: 172.16.10.102 + cluster_node03_hostname: ctl03 + cluster_node03_address: 172.16.10.103 + rabbitmq_secret_key: opnfv_secret + rabbitmq_admin_password: opnfv_secret + rabbitmq_openstack_password: opnfv_secret + rabbitmq_cold_password: opnfv_secret + glance_version: ${_param:openstack_version} + glance_service_host: ${_param:cluster_local_address} + keystone_version: ${_param:openstack_version} + keystone_service_host: ${_param:cluster_local_address} + heat_version: ${_param:openstack_version} + heat_service_host: ${_param:cluster_local_address} + heat_domain_admin_password: opnfv_secret + ceilometer_version: ${_param:openstack_version} + ceilometer_service_host: ${_param:cluster_local_address} + ceilometer_database_host: ${_param:cluster_local_address} + cinder_version: ${_param:openstack_version} + cinder_service_host: ${_param:cluster_local_address} + ceilometer_graphite_publisher_host: 172.16.10.107 + ceilometer_graphite_publisher_port: 2013 + nova_version: ${_param:openstack_version} + nova_service_host: ${_param:cluster_local_address} + nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 + neutron_version: ${_param:openstack_version} + neutron_service_host: ${_param:cluster_local_address} + metadata_password: password + mysql_admin_user: root + mysql_admin_password: opnfv_secret + mysql_cinder_password: opnfv_secret + mysql_ceilometer_password: opnfv_secret + mysql_glance_password: opnfv_secret + mysql_grafana_password: opnfv_secret + mysql_heat_password: opnfv_secret + mysql_keystone_password: opnfv_secret + mysql_neutron_password: opnfv_secret + mysql_nova_password: opnfv_secret + mysql_aodh_password: opnfv_secret + keystone_service_token: opnfv_secret + keystone_admin_password: opnfv_secret + keystone_ceilometer_password: opnfv_secret + keystone_cinder_password: opnfv_secret + keystone_glance_password: opnfv_secret + keystone_heat_password: opnfv_secret + keystone_keystone_password: opnfv_secret + keystone_neutron_password: opnfv_secret + keystone_nova_password: opnfv_secret + ceilometer_secret_key: opnfv_secret + metadata_password: opnfv_secret + horizon_version: ${_param:openstack_version} + horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e + horizon_identity_host: ${_param:cluster_vip_address} + horizon_identity_encryption: none + horizon_identity_version: 3 + mongodb_server_replica_set: ceilometer + mongodb_ceilometer_password: opnfv_secret + mongodb_admin_password: opnfv_secret + mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth + aodh_version: ${_param:openstack_version} + keystone_aodh_password: opnfv_secret + aodh_service_host: ${_param:cluster_local_address} + linux: + system: + kernel: + sysctl: + net.ipv4.tcp_congestion_control: yeah + net.ipv4.tcp_slow_start_after_idle: 0 + net.ipv4.tcp_fin_timeout: 30 + network: + host: + ctl: + address: ${_param:openstack_control_address} + names: + - ctl + - ctl.${_param:cluster_domain} + ctl01: + address: ${_param:openstack_control_node01_address} + names: + - ctl01 + - ctl01.${_param:cluster_domain} + gtw01: + address: ${_param:openstack_gateway_address} + names: + - gtw01 + - gtw01.${_param:cluster_domain} + cmp01: + address: 172.16.10.105 + names: + - cmp01 + - cmp01.${_param:cluster_domain} + cmp02: + address: 172.16.10.106 + names: + - cmp02 + - cmp02.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml index ba710a36e..5cfcd8d05 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml @@ -1,46 +1,7 @@ classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.linux.storage.loopback -- system.nova.compute.single -- service.neutron.compute.single -- service.cinder.volume.single -- system.cinder.volume.backend.lvm +- cluster.virtual-mcp-ocata-common.openstack_compute - cluster.virtual-mcp-ocata-odl-router parameters: - _param: - primary_interface: ens4 - tenant_interface: ens5 - 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: - host: ${_param:openstack_control_address} - metadata: - host: ${_param:openstack_control_address} - cinder: - volume: - database: - host: ${_param:cluster_local_address} - identity: - host: ${_param:cluster_local_address} - glance: - host: ${_param:cluster_local_address} - message_queue: - host: ${_param:cluster_local_address} opendaylight: client: ovsdb_server_iface: ptcp:6639:127.0.0.1 @@ -49,41 +10,14 @@ parameters: provider_mappings: physnet1:br-floating linux: network: - bridge: openvswitch gateway: ${_param:openstack_gateway_address} interface: - dhcp_int: - enabled: true - name: ens3 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth external_interface: enabled: true name: ${_param:external_interface} mtu: ${_param:interface_mtu} proto: manual type: eth - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:primary_interface} br-mesh: enabled: true type: bridge diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml index 4d31b0922..2321caf5d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml @@ -1,102 +1,9 @@ classes: -- system.linux.system.lowmem -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.memcached.server.single -- system.rabbitmq.server.single -- system.rabbitmq.server.vhost.openstack -- system.keystone.server.wsgi -- 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.opendaylight.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.horizon.server.single -- service.haproxy.proxy.single -- cluster.virtual-mcp-ocata-common.haproxy_openstack_api +- cluster.virtual-mcp-ocata-common.openstack_control - cluster.virtual-mcp-ocata-odl-router parameters: - _param: - linux_system_codename: xenial - linux: - system: - package: - python-msgpack: - version: latest - network: - interface: - ens4: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - ens6: - enabled: true - type: eth - proto: static - address: ${_param:cluster_public_host} - netmask: 255.255.255.0 - 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: - engine: file - images: [] - workers: 1 - nova: - controller: - networking: dvr - cpu_allocation: 54 - metadata: - password: ${_param:metadata_password} - bind: - private_address: ${_param:cluster_local_address} - public_address: ${_param:cluster_vip_address} - novncproxy_port: 6080 - vncproxy_url: http://${_param:cluster_vip_address}:6080 - workers: 1 neutron: server: backend: router: ${_param:opendaylight_router} - heat: - server: - bind: - api_cfn: - address: ${_param:single_address} - api_cloudwatch: - address: ${_param:single_address} - mysql: - server: - version: '5.7' - bind: - address: ${_param:cluster_local_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml index fee8097d2..8e5672f63 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml @@ -1,22 +1,14 @@ classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial +- cluster.virtual-mcp-ocata-common.openstack_gateway - system.neutron.gateway.opendaylight.single - cluster.virtual-mcp-ocata-odl-router parameters: _param: - primary_interface: ens4 - tenant_interface: ens5 - external_interface: ens6 - interface_mtu: 9000 - linux_system_codename: xenial neutron_agents: - neutron-dhcp-agent - neutron-metadata-agent neutron: gateway: - agent_mode: ${_param:neutron_gateway_agent_mode} pkgs: ${_param:neutron_agents} services: ${_param:neutron_agents} backend: @@ -29,45 +21,7 @@ parameters: provider_mappings: physnet1:br-floating linux: network: - bridge: openvswitch interface: - dhcp_int: - enabled: true - name: ens3 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - mtu: ${_param:interface_mtu} - use_interfaces: - - ${_param:primary_interface} br-mesh: enabled: true type: bridge @@ -77,18 +31,3 @@ parameters: netmask: 255.255.255.0 use_interfaces: - ${_param:tenant_interface} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml index 69641aa2f..af01e01b4 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml @@ -1,92 +1,8 @@ +classes: +- cluster.virtual-mcp-ocata-common.openstack_init parameters: _param: - openstack_version: ocata - apt_mk_version: nightly - mcp_repo_version: 1.1 - openstack_region: RegionOne - admin_email: root@localhost - cluster_public_protocol: http - cluster_public_host: 10.16.0.101 - neutron_public_protocol: http - neutron_control_dvr: False neutron_tenant_network_types: "flat,vxlan" - neutron_l3_ha: False - neutron_global_physnet_mtu: 1500 - neutron_external_mtu: 1500 - neutron_gateway_dvr: False - neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False - neutron_compute_agent_mode: legacy - neutron_compute_external_access: False - galera_server_cluster_name: openstack_cluster - galera_server_maintenance_password: opnfv_secret - galera_server_admin_password: opnfv_secret - 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 - cluster_node02_address: 172.16.10.102 - cluster_node03_hostname: ctl03 - cluster_node03_address: 172.16.10.103 - rabbitmq_secret_key: opnfv_secret - rabbitmq_admin_password: opnfv_secret - rabbitmq_openstack_password: opnfv_secret - rabbitmq_cold_password: opnfv_secret - glance_version: ${_param:openstack_version} - glance_service_host: ${_param:cluster_local_address} - keystone_version: ${_param:openstack_version} - keystone_service_host: ${_param:cluster_local_address} - heat_version: ${_param:openstack_version} - heat_service_host: ${_param:cluster_local_address} - heat_domain_admin_password: opnfv_secret - ceilometer_version: ${_param:openstack_version} - ceilometer_service_host: 172.16.10.108 - ceilometer_database_host: ${_param:cluster_local_address} - cinder_version: ${_param:openstack_version} - cinder_service_host: ${_param:cluster_local_address} - ceilometer_graphite_publisher_host: 172.16.10.107 - ceilometer_graphite_publisher_port: 2013 - nova_version: ${_param:openstack_version} - nova_service_host: ${_param:cluster_local_address} - nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 - neutron_version: ${_param:openstack_version} - neutron_service_host: ${_param:cluster_local_address} - metadata_password: password - mysql_admin_user: root - mysql_admin_password: opnfv_secret - mysql_cinder_password: opnfv_secret - mysql_ceilometer_password: opnfv_secret - mysql_glance_password: opnfv_secret - mysql_grafana_password: opnfv_secret - mysql_heat_password: opnfv_secret - mysql_keystone_password: opnfv_secret - mysql_neutron_password: opnfv_secret - mysql_nova_password: opnfv_secret - mysql_aodh_password: opnfv_secret - keystone_service_token: opnfv_secret - keystone_admin_password: opnfv_secret - keystone_ceilometer_password: opnfv_secret - keystone_cinder_password: opnfv_secret - keystone_glance_password: opnfv_secret - keystone_heat_password: opnfv_secret - keystone_keystone_password: opnfv_secret - keystone_neutron_password: opnfv_secret - keystone_nova_password: opnfv_secret - ceilometer_secret_key: opnfv_secret - metadata_password: opnfv_secret - horizon_version: ${_param:openstack_version} - horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e - horizon_identity_host: ${_param:cluster_vip_address} - horizon_identity_encryption: none - horizon_identity_version: 3 - mongodb_server_replica_set: ceilometer - mongodb_ceilometer_password: cloudlab - mongodb_admin_password: cloudlab - mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth - aodh_version: ${_param:openstack_version} - keystone_aodh_password: opnfv_secret - aodh_service_host: 172.16.10.108 opendaylight_router: odl-router_v2 linux: system: @@ -96,38 +12,8 @@ parameters: architectures: amd64 key_id: EC4926EA key_server: keyserver.ubuntu.com - kernel: - sysctl: - net.ipv4.tcp_congestion_control: yeah - net.ipv4.tcp_slow_start_after_idle: 0 - net.ipv4.tcp_fin_timeout: 30 network: host: - ctl: - address: ${_param:openstack_control_address} - names: - - ctl - - ctl.${_param:cluster_domain} - ctl01: - address: ${_param:openstack_control_node01_address} - names: - - ctl01 - - ctl01.${_param:cluster_domain} - gtw01: - address: ${_param:openstack_gateway_address} - names: - - gtw01 - - gtw01.${_param:cluster_domain} - cmp01: - address: 172.16.10.105 - names: - - cmp01 - - cmp01.${_param:cluster_domain} - cmp02: - address: 172.16.10.106 - names: - - cmp02 - - cmp02.${_param:cluster_domain} odl01: address: 172.16.10.111 names: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml index 97eda6c51..f3f8520dd 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml @@ -1,46 +1,7 @@ classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.linux.storage.loopback -- system.nova.compute.single -- service.neutron.compute.single -- service.cinder.volume.single -- system.cinder.volume.backend.lvm +- cluster.virtual-mcp-ocata-common.openstack_compute - cluster.virtual-mcp-ocata-odl parameters: - _param: - primary_interface: ens4 - tenant_interface: ens5 - 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: - host: ${_param:openstack_control_address} - metadata: - host: ${_param:openstack_control_address} - cinder: - volume: - database: - host: ${_param:cluster_local_address} - identity: - host: ${_param:cluster_local_address} - glance: - host: ${_param:cluster_local_address} - message_queue: - host: ${_param:cluster_local_address} opendaylight: client: ovsdb_server_iface: ptcp:6639:127.0.0.1 @@ -48,34 +9,7 @@ parameters: tunnel_ip: ${_param:tenant_address} linux: network: - bridge: openvswitch interface: - dhcp_int: - enabled: true - name: ens3 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:primary_interface} br-mesh: enabled: true type: bridge diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml index 17c22c59e..11c23916f 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml @@ -1,98 +1,4 @@ classes: -- system.linux.system.lowmem -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.memcached.server.single -- system.rabbitmq.server.single -- system.rabbitmq.server.vhost.openstack -- system.keystone.server.wsgi -- 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.opendaylight.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.horizon.server.single -- service.haproxy.proxy.single -- cluster.virtual-mcp-ocata-common.haproxy_openstack_api +- cluster.virtual-mcp-ocata-common.openstack_control - cluster.virtual-mcp-ocata-odl -parameters: - _param: - linux_system_codename: xenial - linux: - system: - package: - python-msgpack: - version: latest - network: - interface: - ens4: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - ens6: - enabled: true - type: eth - proto: static - address: ${_param:cluster_public_host} - netmask: 255.255.255.0 - 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: - engine: file - images: [] - workers: 1 - nova: - controller: - networking: dvr - cpu_allocation: 54 - metadata: - password: ${_param:metadata_password} - bind: - private_address: ${_param:cluster_local_address} - public_address: ${_param:cluster_vip_address} - novncproxy_port: 6080 - vncproxy_url: http://${_param:cluster_vip_address}:6080 - workers: 1 - heat: - server: - bind: - api_cfn: - address: ${_param:single_address} - api_cloudwatch: - address: ${_param:single_address} - mysql: - server: - version: '5.7' - bind: - address: ${_param:cluster_local_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml index e8421caa3..fd01f3c32 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml @@ -1,23 +1,15 @@ classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial +- cluster.virtual-mcp-ocata-common.openstack_gateway - system.neutron.gateway.opendaylight.single - cluster.virtual-mcp-ocata-odl parameters: _param: - primary_interface: ens4 - tenant_interface: ens5 - external_interface: ens6 - interface_mtu: 9000 - linux_system_codename: xenial neutron_agents: - neutron-l3-agent - neutron-dhcp-agent - neutron-metadata-agent neutron: gateway: - agent_mode: ${_param:neutron_gateway_agent_mode} pkgs: ${_param:neutron_agents} services: ${_param:neutron_agents} opendaylight: @@ -28,45 +20,7 @@ parameters: provider_mappings: physnet1:br-floating linux: network: - bridge: openvswitch interface: - dhcp_int: - enabled: true - name: ens3 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - mtu: ${_param:interface_mtu} - use_interfaces: - - ${_param:primary_interface} br-mesh: enabled: true type: bridge @@ -76,18 +30,3 @@ parameters: netmask: 255.255.255.0 use_interfaces: - ${_param:tenant_interface} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml index 66e5a9788..d86b673ec 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml @@ -1,92 +1,8 @@ +classes: +- cluster.virtual-mcp-ocata-common.openstack_init parameters: _param: - openstack_version: ocata - apt_mk_version: nightly - mcp_repo_version: 1.1 - openstack_region: RegionOne - admin_email: root@localhost - cluster_public_protocol: http - cluster_public_host: 10.16.0.101 - neutron_public_protocol: http - neutron_control_dvr: False neutron_tenant_network_types: "flat,vxlan" - neutron_l3_ha: False - neutron_global_physnet_mtu: 1500 - neutron_external_mtu: 1500 - neutron_gateway_dvr: False - neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False - neutron_compute_agent_mode: legacy - neutron_compute_external_access: False - galera_server_cluster_name: openstack_cluster - galera_server_maintenance_password: opnfv_secret - galera_server_admin_password: opnfv_secret - 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 - cluster_node02_address: 172.16.10.102 - cluster_node03_hostname: ctl03 - cluster_node03_address: 172.16.10.103 - rabbitmq_secret_key: opnfv_secret - rabbitmq_admin_password: opnfv_secret - rabbitmq_openstack_password: opnfv_secret - rabbitmq_cold_password: opnfv_secret - glance_version: ${_param:openstack_version} - glance_service_host: ${_param:cluster_local_address} - keystone_version: ${_param:openstack_version} - keystone_service_host: ${_param:cluster_local_address} - heat_version: ${_param:openstack_version} - heat_service_host: ${_param:cluster_local_address} - heat_domain_admin_password: opnfv_secret - ceilometer_version: ${_param:openstack_version} - ceilometer_service_host: 172.16.10.108 - ceilometer_database_host: ${_param:cluster_local_address} - cinder_version: ${_param:openstack_version} - cinder_service_host: ${_param:cluster_local_address} - ceilometer_graphite_publisher_host: 172.16.10.107 - ceilometer_graphite_publisher_port: 2013 - nova_version: ${_param:openstack_version} - nova_service_host: ${_param:cluster_local_address} - nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 - neutron_version: ${_param:openstack_version} - neutron_service_host: ${_param:cluster_local_address} - metadata_password: password - mysql_admin_user: root - mysql_admin_password: opnfv_secret - mysql_cinder_password: opnfv_secret - mysql_ceilometer_password: opnfv_secret - mysql_glance_password: opnfv_secret - mysql_grafana_password: opnfv_secret - mysql_heat_password: opnfv_secret - mysql_keystone_password: opnfv_secret - mysql_neutron_password: opnfv_secret - mysql_nova_password: opnfv_secret - mysql_aodh_password: opnfv_secret - keystone_service_token: opnfv_secret - keystone_admin_password: opnfv_secret - keystone_ceilometer_password: opnfv_secret - keystone_cinder_password: opnfv_secret - keystone_glance_password: opnfv_secret - keystone_heat_password: opnfv_secret - keystone_keystone_password: opnfv_secret - keystone_neutron_password: opnfv_secret - keystone_nova_password: opnfv_secret - ceilometer_secret_key: opnfv_secret - metadata_password: opnfv_secret - horizon_version: ${_param:openstack_version} - horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e - horizon_identity_host: ${_param:cluster_vip_address} - horizon_identity_encryption: none - horizon_identity_version: 3 - mongodb_server_replica_set: ceilometer - mongodb_ceilometer_password: cloudlab - mongodb_admin_password: cloudlab - mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth - aodh_version: ${_param:openstack_version} - keystone_aodh_password: opnfv_secret - aodh_service_host: 172.16.10.108 linux: system: repo: @@ -95,38 +11,8 @@ parameters: architectures: amd64 key_id: EC4926EA key_server: keyserver.ubuntu.com - kernel: - sysctl: - net.ipv4.tcp_congestion_control: yeah - net.ipv4.tcp_slow_start_after_idle: 0 - net.ipv4.tcp_fin_timeout: 30 network: host: - ctl: - address: ${_param:openstack_control_address} - names: - - ctl - - ctl.${_param:cluster_domain} - ctl01: - address: ${_param:openstack_control_node01_address} - names: - - ctl01 - - ctl01.${_param:cluster_domain} - gtw01: - address: ${_param:openstack_gateway_address} - names: - - gtw01 - - gtw01.${_param:cluster_domain} - cmp01: - address: 172.16.10.105 - names: - - cmp01 - - cmp01.${_param:cluster_domain} - cmp02: - address: 172.16.10.106 - names: - - cmp02 - - cmp02.${_param:cluster_domain} odl01: address: 172.16.10.111 names: 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 c23ca7f33..4396e315a 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 @@ -1,80 +1,16 @@ classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- 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-common.openstack_compute - cluster.virtual-mcp-ocata-ovs-dpdk parameters: - _param: - primary_interface: ens4 - tenant_interface: ens5 - 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: - host: ${_param:openstack_control_address} - metadata: - host: ${_param:openstack_control_address} backend: tenant_network_types: ${_param:neutron_tenant_network_types} - cinder: - volume: - database: - host: ${_param:cluster_local_address} - identity: - host: ${_param:cluster_local_address} - glance: - host: ${_param:cluster_local_address} - message_queue: - host: ${_param:cluster_local_address} linux: network: - bridge: openvswitch interface: - dhcp_int: - enabled: true - name: ens3 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:primary_interface} dpdk0: name: ${_param:dpdk0_name} pci: ${_param:dpdk0_pci} 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 b85f085a1..fb3f0e5d7 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,102 +1,9 @@ classes: -- system.linux.system.lowmem -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.memcached.server.single -- system.rabbitmq.server.single -- system.rabbitmq.server.vhost.openstack -- system.keystone.server.wsgi -- 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.horizon.server.single -- service.haproxy.proxy.single -- cluster.virtual-mcp-ocata-common.haproxy_openstack_api +- cluster.virtual-mcp-ocata-common.openstack_control - cluster.virtual-mcp-ocata-ovs-dpdk parameters: - _param: - linux_system_codename: xenial - linux: - system: - package: - python-msgpack: - version: latest - network: - interface: - ens4: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - ens6: - enabled: true - type: eth - proto: static - address: ${_param:cluster_public_host} - netmask: 255.255.255.0 - 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: - engine: file - images: [] - workers: 1 - nova: - controller: - networking: dvr - cpu_allocation: 54 - metadata: - password: ${_param:metadata_password} - bind: - private_address: ${_param:cluster_local_address} - public_address: ${_param:cluster_vip_address} - novncproxy_port: 6080 - vncproxy_url: http://${_param:cluster_vip_address}:6080 - workers: 1 neutron: server: backend: tenant_vlan_range: 1000:1999 - heat: - server: - bind: - api_cfn: - address: ${_param:single_address} - api_cloudwatch: - address: ${_param:single_address} - 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 e102c10b3..96af8cbd9 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 @@ -1,79 +1,18 @@ classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial +- cluster.virtual-mcp-ocata-common.openstack_gateway - service.neutron.gateway.single - cluster.virtual-mcp-ocata-ovs-dpdk parameters: - _param: - primary_interface: ens4 - tenant_interface: ens5 - 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 interface: - dhcp_int: - enabled: true - name: ens3 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth tenant_interface: - enabled: true ovs_bridge: br-prv - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - mtu: ${_param:interface_mtu} - use_interfaces: - - ${_param:primary_interface} br-prv: enabled: true type: ovs_bridge mtu: ${_param:interface_mtu} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex 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 dfc0b5106..c034ddfad 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 @@ -1,26 +1,8 @@ +classes: +- cluster.virtual-mcp-ocata-common.openstack_init parameters: _param: - openstack_version: ocata - apt_mk_version: nightly - mcp_repo_version: 1.1 - openstack_region: RegionOne - admin_email: root@localhost - cluster_public_protocol: http - cluster_public_host: 10.16.0.101 - neutron_public_protocol: http - neutron_control_dvr: False neutron_tenant_network_types: "flat,vlan" - neutron_l3_ha: False - neutron_global_physnet_mtu: 1500 - neutron_external_mtu: 1500 - neutron_gateway_dvr: False - neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False - neutron_compute_agent_mode: legacy - neutron_compute_external_access: False - galera_server_cluster_name: openstack_cluster - galera_server_maintenance_password: opnfv_secret - galera_server_admin_password: opnfv_secret compute_hugepages_size: 2M compute_hugepages_count: 1024 compute_hugepages_mount: /mnt/hugepages_2M @@ -29,102 +11,3 @@ 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 - cluster_node02_address: 172.16.10.102 - cluster_node03_hostname: ctl03 - cluster_node03_address: 172.16.10.103 - rabbitmq_secret_key: opnfv_secret - rabbitmq_admin_password: opnfv_secret - rabbitmq_openstack_password: opnfv_secret - rabbitmq_cold_password: opnfv_secret - glance_version: ${_param:openstack_version} - glance_service_host: ${_param:cluster_local_address} - keystone_version: ${_param:openstack_version} - keystone_service_host: ${_param:cluster_local_address} - heat_version: ${_param:openstack_version} - heat_service_host: ${_param:cluster_local_address} - heat_domain_admin_password: opnfv_secret - ceilometer_version: ${_param:openstack_version} - ceilometer_service_host: 172.16.10.108 - cinder_version: ${_param:openstack_version} - cinder_service_host: ${_param:cluster_local_address} - ceilometer_graphite_publisher_host: 172.16.10.107 - ceilometer_graphite_publisher_port: 2013 - nova_version: ${_param:openstack_version} - nova_service_host: ${_param:cluster_local_address} - nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 - neutron_version: ${_param:openstack_version} - neutron_service_host: ${_param:cluster_local_address} - metadata_password: password - mysql_admin_user: root - mysql_admin_password: opnfv_secret - mysql_cinder_password: opnfv_secret - mysql_ceilometer_password: opnfv_secret - mysql_glance_password: opnfv_secret - mysql_grafana_password: opnfv_secret - mysql_heat_password: opnfv_secret - mysql_keystone_password: opnfv_secret - mysql_neutron_password: opnfv_secret - mysql_nova_password: opnfv_secret - mysql_aodh_password: opnfv_secret - keystone_service_token: opnfv_secret - keystone_admin_password: opnfv_secret - keystone_ceilometer_password: opnfv_secret - keystone_cinder_password: opnfv_secret - keystone_glance_password: opnfv_secret - keystone_heat_password: opnfv_secret - keystone_keystone_password: opnfv_secret - keystone_neutron_password: opnfv_secret - keystone_nova_password: opnfv_secret - ceilometer_secret_key: opnfv_secret - metadata_password: opnfv_secret - horizon_version: ${_param:openstack_version} - horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e - horizon_identity_host: ${_param:cluster_vip_address} - horizon_identity_encryption: none - horizon_identity_version: 3 - mongodb_server_replica_set: ceilometer - mongodb_ceilometer_password: cloudlab - mongodb_admin_password: cloudlab - mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth - aodh_version: ${_param:openstack_version} - keystone_aodh_password: opnfv_secret - aodh_service_host: 172.16.10.108 - linux: - system: - kernel: - sysctl: - net.ipv4.tcp_congestion_control: yeah - net.ipv4.tcp_slow_start_after_idle: 0 - net.ipv4.tcp_fin_timeout: 30 - network: - host: - ctl: - address: ${_param:openstack_control_address} - names: - - ctl - - ctl.${_param:cluster_domain} - ctl01: - address: ${_param:openstack_control_node01_address} - names: - - ctl01 - - ctl01.${_param:cluster_domain} - gtw01: - address: ${_param:openstack_gateway_address} - names: - - gtw01 - - gtw01.${_param:cluster_domain} - cmp01: - address: 172.16.10.105 - names: - - cmp01 - - cmp01.${_param:cluster_domain} - cmp02: - address: 172.16.10.106 - names: - - cmp02 - - cmp02.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml index a86a7c6ac..a53d4e923 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml @@ -1,76 +1,10 @@ classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.linux.storage.loopback -- system.nova.compute.single -- service.neutron.compute.single -- service.cinder.volume.single -- system.cinder.volume.backend.lvm +- cluster.virtual-mcp-ocata-common.openstack_compute - cluster.virtual-mcp-ocata-ovs parameters: - _param: - primary_interface: ens4 - tenant_interface: ens5 - 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: - host: ${_param:openstack_control_address} - metadata: - host: ${_param:openstack_control_address} - cinder: - volume: - database: - host: ${_param:cluster_local_address} - identity: - host: ${_param:cluster_local_address} - glance: - host: ${_param:cluster_local_address} - message_queue: - host: ${_param:cluster_local_address} linux: network: - bridge: openvswitch interface: - dhcp_int: - enabled: true - name: ens3 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:primary_interface} br-mesh: enabled: true type: bridge diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml index ae103cd58..7e8f5dcdc 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml @@ -1,98 +1,4 @@ classes: -- system.linux.system.lowmem -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.memcached.server.single -- system.rabbitmq.server.single -- system.rabbitmq.server.vhost.openstack -- system.keystone.server.wsgi -- 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.horizon.server.single -- service.haproxy.proxy.single -- cluster.virtual-mcp-ocata-common.haproxy_openstack_api +- cluster.virtual-mcp-ocata-common.openstack_control - cluster.virtual-mcp-ocata-ovs -parameters: - _param: - linux_system_codename: xenial - linux: - system: - package: - python-msgpack: - version: latest - network: - interface: - ens4: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - ens6: - enabled: true - type: eth - proto: static - address: ${_param:cluster_public_host} - netmask: 255.255.255.0 - 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: - engine: file - images: [] - workers: 1 - nova: - controller: - networking: dvr - cpu_allocation: 54 - metadata: - password: ${_param:metadata_password} - bind: - private_address: ${_param:cluster_local_address} - public_address: ${_param:cluster_vip_address} - novncproxy_port: 6080 - vncproxy_url: http://${_param:cluster_vip_address}:6080 - workers: 1 - heat: - server: - bind: - api_cfn: - address: ${_param:single_address} - api_cloudwatch: - address: ${_param:single_address} - mysql: - server: - version: '5.7' - bind: - address: ${_param:cluster_local_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml index 9257d8604..e73c051e3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml @@ -1,60 +1,11 @@ classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial + cluster.virtual-mcp-ocata-common.openstack_gateway - service.neutron.gateway.single - cluster.virtual-mcp-ocata-ovs parameters: - _param: - primary_interface: ens4 - tenant_interface: ens5 - external_interface: ens6 - interface_mtu: 9000 - linux_system_codename: xenial - neutron: - gateway: - agent_mode: ${_param:neutron_gateway_agent_mode} linux: network: - bridge: openvswitch interface: - dhcp_int: - enabled: true - name: ens3 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - mtu: ${_param:interface_mtu} - use_interfaces: - - ${_param:primary_interface} br-mesh: enabled: true type: bridge @@ -64,18 +15,3 @@ parameters: netmask: 255.255.255.0 use_interfaces: - ${_param:tenant_interface} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml index 7079fd100..f8f01298c 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml @@ -1,123 +1,5 @@ +classes: +- cluster.virtual-mcp-ocata-common.openstack_init parameters: _param: - openstack_version: ocata - apt_mk_version: nightly - mcp_repo_version: 1.1 - openstack_region: RegionOne - admin_email: root@localhost - cluster_public_protocol: http - cluster_public_host: 10.16.0.101 - neutron_public_protocol: http - neutron_control_dvr: False neutron_tenant_network_types: "flat,vxlan" - neutron_l3_ha: False - neutron_global_physnet_mtu: 1500 - neutron_external_mtu: 1500 - neutron_gateway_dvr: False - neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False - neutron_compute_agent_mode: legacy - neutron_compute_external_access: False - galera_server_cluster_name: openstack_cluster - galera_server_maintenance_password: opnfv_secret - galera_server_admin_password: opnfv_secret - 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 - cluster_node02_address: 172.16.10.102 - cluster_node03_hostname: ctl03 - cluster_node03_address: 172.16.10.103 - rabbitmq_secret_key: opnfv_secret - rabbitmq_admin_password: opnfv_secret - rabbitmq_openstack_password: opnfv_secret - rabbitmq_cold_password: opnfv_secret - glance_version: ${_param:openstack_version} - glance_service_host: ${_param:cluster_local_address} - keystone_version: ${_param:openstack_version} - keystone_service_host: ${_param:cluster_local_address} - heat_version: ${_param:openstack_version} - heat_service_host: ${_param:cluster_local_address} - heat_domain_admin_password: opnfv_secret - ceilometer_version: ${_param:openstack_version} - ceilometer_service_host: 172.16.10.108 - ceilometer_database_host: ${_param:cluster_local_address} - cinder_version: ${_param:openstack_version} - cinder_service_host: ${_param:cluster_local_address} - ceilometer_graphite_publisher_host: 172.16.10.107 - ceilometer_graphite_publisher_port: 2013 - nova_version: ${_param:openstack_version} - nova_service_host: ${_param:cluster_local_address} - nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 - neutron_version: ${_param:openstack_version} - neutron_service_host: ${_param:cluster_local_address} - metadata_password: password - mysql_admin_user: root - mysql_admin_password: opnfv_secret - mysql_cinder_password: opnfv_secret - mysql_ceilometer_password: opnfv_secret - mysql_glance_password: opnfv_secret - mysql_grafana_password: opnfv_secret - mysql_heat_password: opnfv_secret - mysql_keystone_password: opnfv_secret - mysql_neutron_password: opnfv_secret - mysql_nova_password: opnfv_secret - mysql_aodh_password: opnfv_secret - keystone_service_token: opnfv_secret - keystone_admin_password: opnfv_secret - keystone_ceilometer_password: opnfv_secret - keystone_cinder_password: opnfv_secret - keystone_glance_password: opnfv_secret - keystone_heat_password: opnfv_secret - keystone_keystone_password: opnfv_secret - keystone_neutron_password: opnfv_secret - keystone_nova_password: opnfv_secret - ceilometer_secret_key: opnfv_secret - metadata_password: opnfv_secret - horizon_version: ${_param:openstack_version} - horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e - horizon_identity_host: ${_param:cluster_vip_address} - horizon_identity_encryption: none - horizon_identity_version: 3 - mongodb_server_replica_set: ceilometer - mongodb_ceilometer_password: cloudlab - mongodb_admin_password: cloudlab - mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth - aodh_version: ${_param:openstack_version} - keystone_aodh_password: opnfv_secret - aodh_service_host: 172.16.10.108 - linux: - system: - kernel: - sysctl: - net.ipv4.tcp_congestion_control: yeah - net.ipv4.tcp_slow_start_after_idle: 0 - net.ipv4.tcp_fin_timeout: 30 - network: - host: - ctl: - address: ${_param:openstack_control_address} - names: - - ctl - - ctl.${_param:cluster_domain} - ctl01: - address: ${_param:openstack_control_node01_address} - names: - - ctl01 - - ctl01.${_param:cluster_domain} - gtw01: - address: ${_param:openstack_gateway_address} - names: - - gtw01 - - gtw01.${_param:cluster_domain} - cmp01: - address: 172.16.10.105 - names: - - cmp01 - - cmp01.${_param:cluster_domain} - cmp02: - address: 172.16.10.106 - names: - - cmp02 - - cmp02.${_param:cluster_domain} |