diff options
7 files changed, 79 insertions, 1 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 8ca76e49f..78da80a3f 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -28,7 +28,7 @@ salt -I 'keystone:client' state.sls keystone.client salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list" salt -I 'glance:server' state.sls glance -b 1 -salt -I 'glance:server' state.sls glusterfs.client +salt -I 'glusterfs:client' state.sls glusterfs.client salt -I 'keystone:server' state.sls keystone.server salt -I 'nova:controller' state.sls nova -b 1 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml index 41366f34f..acd6a6d34 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml @@ -120,6 +120,22 @@ parameters: eth0: bridge: br-ctl model: virtio + glusterfs: + server: + volumes: + nova_instances: + storage: /srv/glusterfs/nova_instances + replica: 3 + bricks: + - ${_param:cluster_node01_address}:/srv/glusterfs/nova_instances + - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances + - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances + options: + cluster.readdir-optimize: On + nfs.disable: On + network.remote-dio: On + diagnostics.client-log-level: WARNING + diagnostics.brick-log-level: WARNING linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml index 6d2c7f39c..c5333fe76 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml @@ -3,6 +3,7 @@ classes: - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial - system.linux.storage.loopback +- system.glusterfs.client.cluster - system.nova.compute.cluster - system.nova.compute.nfv.hugepages - system.nova.compute.nfv.cpu_pinning @@ -47,6 +48,15 @@ parameters: services: ${_param:neutron_agents} backend: router: ${_param:opendaylight_router} + glusterfs: + client: + volumes: + nova_instances: + path: /var/lib/nova/instances + server: ${_param:glusterfs_service_host} + user: nova + group: nova + opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: network: bridge: openvswitch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml index 22b4a8a21..d77aeff7a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml @@ -110,6 +110,22 @@ parameters: eth0: bridge: br-ctl model: virtio + glusterfs: + server: + volumes: + nova_instances: + storage: /srv/glusterfs/nova_instances + replica: 3 + bricks: + - ${_param:cluster_node01_address}:/srv/glusterfs/nova_instances + - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances + - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances + options: + cluster.readdir-optimize: On + nfs.disable: On + network.remote-dio: On + diagnostics.client-log-level: WARNING + diagnostics.brick-log-level: WARNING linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml index 39747e49d..04e652c23 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml @@ -3,6 +3,7 @@ classes: - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial - system.linux.storage.loopback +- system.glusterfs.client.cluster - system.nova.compute.cluster - system.nova.compute.nfv.hugepages - system.nova.compute.nfv.cpu_pinning @@ -38,6 +39,15 @@ parameters: nova: compute: libvirt_service: libvirtd + glusterfs: + client: + volumes: + nova_instances: + path: /var/lib/nova/instances + server: ${_param:glusterfs_service_host} + user: nova + group: nova + opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: system: repo: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml index 5c8026f26..7550c1af8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml @@ -112,6 +112,22 @@ parameters: eth0: bridge: br-ctl model: virtio + glusterfs: + server: + volumes: + nova_instances: + storage: /srv/glusterfs/nova_instances + replica: 3 + bricks: + - ${_param:cluster_node01_address}:/srv/glusterfs/nova_instances + - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances + - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances + options: + cluster.readdir-optimize: On + nfs.disable: On + network.remote-dio: On + diagnostics.client-log-level: WARNING + diagnostics.brick-log-level: WARNING linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml index e11e35e54..93a26b19e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml @@ -3,6 +3,7 @@ classes: - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial - system.linux.storage.loopback +- system.glusterfs.client.cluster - system.nova.compute.cluster - system.nova.compute.nfv.hugepages - system.nova.compute.nfv.cpu_pinning @@ -30,6 +31,15 @@ parameters: keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 loopback_device_size: 20 + glusterfs: + client: + volumes: + nova_instances: + path: /var/lib/nova/instances + server: ${_param:glusterfs_service_host} + user: nova + group: nova + opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: network: bridge: openvswitch |