Add 'TEST PR' section to README

README.md

@@ -1,3 +1,6 @@
+TEST PR 
+
+
 # Deploy a Production Ready Kubernetes Cluster
 
 ![Kubernetes Logo](https://raw.githubusercontent.com/kubernetes-sigs/kubespray/master/docs/img/kubernetes-logo.png)

contrib/terraform/openstack/modules/compute/main.tf

@@ -1006,7 +1006,7 @@ resource "openstack_compute_instance_v2" "glusterfs_node_no_floating_ip" {
   name              = "${var.cluster_name}-gfs-node-nf-${count.index + 1}"
   count             = var.number_of_gfs_nodes_no_floating_ip
   availability_zone = element(var.az_list, count.index)
-  image_id          = var.gfs_root_volume_size_in_gb == 0 ? local.image_to_use_gfs : null
+  image_name        = var.gfs_root_volume_size_in_gb == 0 ? local.image_to_use_gfs : null
   flavor_id         = var.flavor_gfs_node
   key_pair          = openstack_compute_keypair_v2.k8s.name
 
@@ -1078,7 +1078,7 @@ resource "openstack_networking_floatingip_associate_v2" "k8s_nodes" {
   port_id               = openstack_networking_port_v2.k8s_nodes_port[each.key].id
 }
 
-resource "openstack_blockstorage_volume_v3" "glusterfs_volume" {
+resource "openstack_blockstorage_volume_v2" "glusterfs_volume" {
   name        = "${var.cluster_name}-glusterfs_volume-${count.index + 1}"
   count       = var.gfs_root_volume_size_in_gb == 0 ? var.number_of_gfs_nodes_no_floating_ip : 0
   description = "Non-ephemeral volume for GlusterFS"
@@ -1088,5 +1088,5 @@ resource "openstack_blockstorage_volume_v3" "glusterfs_volume" {
 resource "openstack_compute_volume_attach_v2" "glusterfs_volume" {
   count       = var.gfs_root_volume_size_in_gb == 0 ? var.number_of_gfs_nodes_no_floating_ip : 0
   instance_id = element(openstack_compute_instance_v2.glusterfs_node_no_floating_ip.*.id, count.index)
-  volume_id   = element(openstack_blockstorage_volume_v3.glusterfs_volume.*.id, count.index)
+  volume_id   = element(openstack_blockstorage_volume_v2.glusterfs_volume.*.id, count.index)
 }

roles/network_plugin/meta/main.yml

@@ -0,0 +1,44 @@
+---
+dependencies:
+  - role: network_plugin/cni
+    when: kube_network_plugin != 'none'
+
+  - role: network_plugin/cilium
+    when: kube_network_plugin == 'cilium' or cilium_deploy_additionally
+    tags:
+      - cilium
+
+  - role: network_plugin/calico
+    when: kube_network_plugin == 'calico'
+    tags:
+      - calico
+
+  - role: network_plugin/flannel
+    when: kube_network_plugin == 'flannel'
+    tags:
+      - flannel
+
+  - role: network_plugin/macvlan
+    when: kube_network_plugin == 'macvlan'
+    tags:
+      - macvlan
+
+  - role: network_plugin/kube-ovn
+    when: kube_network_plugin == 'kube-ovn'
+    tags:
+      - kube-ovn
+
+  - role: network_plugin/kube-router
+    when: kube_network_plugin == 'kube-router'
+    tags:
+      - kube-router
+
+  - role: network_plugin/custom_cni
+    when: kube_network_plugin == 'custom_cni'
+    tags:
+      - custom_cni
+
+  - role: network_plugin/multus
+    when: kube_network_plugin_multus
+    tags:
+      - multus

roles/network_plugin/tasks/main.yml

@@ -1,47 +0,0 @@
----
-- name: Container Network Interface plugin
-  include_role:
-    name: network_plugin/cni
-  when: kube_network_plugin != 'none'
-
-- name: Network plugin
-  include_role:
-    name: "network_plugin/{{ kube_network_plugin }}"
-    apply:
-      tags:
-        - "{{ kube_network_plugin }}"
-        - network
-  when:
-    - kube_network_plugin != 'none'
-  tags:
-    - cilium
-    - calico
-    - flannel
-    - macvlan
-    - kube-ovn
-    - kube-router
-    - custom_cni
-
-- name: Cilium additional
-  include_role:
-    name: network_plugin/cilium
-    apply:
-      tags:
-        - cilium
-        - network
-  when:
-    - kube_network_plugin != 'cilium'
-    - cilium_deploy_additionally
-  tags:
-    - cilium
-
-- name: Multus
-  include_role:
-    name: network_plugin/multus
-    apply:
-      tags:
-        - multus
-        - network
-  when: kube_network_plugin_multus
-  tags:
-    - multus