From d7a0643d17f31b8fd11f38a4a4376769ef8d7b53 Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Fri, 14 Jun 2024 22:12:25 +0100 Subject: [PATCH] Update github.com/openstack-k8s-operators/openstack-ansibleee-operator/api digest to f345621 Signed-off-by: Fabricio Aguiar --- go.mod | 2 +- go.sum | 4 ++-- pkg/dataplane/util/ansible_execution.go | 2 +- .../tests/dataplane-deploy-global-service-test/01-assert.yaml | 2 +- .../kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml | 2 +- tests/kuttl/tests/dataplane-service-config/00-assert.yaml | 2 +- tests/kuttl/tests/dataplane-service-failure/00-assert.yaml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index f238e6b95..5770469d5 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240612151610-3a231baf6d66 github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240613191819-c7395c1ce221 github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240614142111-2787761a35ad - github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240614082333-ba5ccac57b98 + github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240614182704-f34562163ea1 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240604070904-cdec81ca1825 github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240614143745-cbe8d2bba3e4 diff --git a/go.sum b/go.sum index d80ace4c0..6fbc20c09 100644 --- a/go.sum +++ b/go.sum @@ -138,8 +138,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240613191819-c73 github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240613191819-c7395c1ce221/go.mod h1:WBFg1svuMtir+Geo7InZAsEy1LljZkQHfIWuMLMDhTI= github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240614142111-2787761a35ad h1:1KeQrhokDl+Ijlh8DZg/1rWKtXbaplxvh+k8mkR3nTc= github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240614142111-2787761a35ad/go.mod h1:h03g3HXawiEFYu4r9MD79RXrjc+UGivcHo/Sq2ByUC0= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240614082333-ba5ccac57b98 h1:sEVsQ3soYeIQvfUPloDaZLo60/j0avLI+st/n1Mc8LA= -github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240614082333-ba5ccac57b98/go.mod h1:xUs3AGYcf5NjmKqQeMfyQO+R824WTliFqCxYSynjbxw= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240614182704-f34562163ea1 h1:w6PPDppuWyfgiJH4ZncdZohTLWISsD94sQ8SViW+e+k= +github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240614182704-f34562163ea1/go.mod h1:xUs3AGYcf5NjmKqQeMfyQO+R824WTliFqCxYSynjbxw= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240604070904-cdec81ca1825 h1:kr9NflFeXZfNBmx2ilSbcsXn8uI9Qx+RzOQXNiCQnX8= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240604070904-cdec81ca1825/go.mod h1:h6Nak5Gev8lUM/5aKpjgDXy9Rj3/iICEySV+NPYr7Nw= github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240614143745-cbe8d2bba3e4 h1:ytwZ/esu8n/azfG6U8BFQalZyf1nzPswlhklXm0RWJE= diff --git a/pkg/dataplane/util/ansible_execution.go b/pkg/dataplane/util/ansible_execution.go index e2a89ef3d..af22044ac 100644 --- a/pkg/dataplane/util/ansible_execution.go +++ b/pkg/dataplane/util/ansible_execution.go @@ -102,7 +102,7 @@ func AnsibleExecution( } if len(service.Spec.PlaybookContents) > 0 { - ansibleEE.Spec.Play = service.Spec.PlaybookContents + ansibleEE.Spec.PlaybookContents = service.Spec.PlaybookContents } if len(service.Spec.Playbook) > 0 { ansibleEE.Spec.Playbook = service.Spec.Playbook diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml index ab4189bcb..583f451ad 100644 --- a/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml @@ -112,7 +112,7 @@ spec: extraVars: edpm_override_hosts: all name: openstackansibleee - play: | + playbookContents: | - hosts: localhost gather_facts: no name: global kuttl play diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml index 487c1d40e..37fe93432 100644 --- a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml +++ b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml @@ -46,7 +46,7 @@ spec: path: inventory secretName: dataplanenodeset-edpm-compute-no-nodes name: openstackansibleee - play: | + playbookContents: | - hosts: localhost gather_facts: no name: kuttl play diff --git a/tests/kuttl/tests/dataplane-service-config/00-assert.yaml b/tests/kuttl/tests/dataplane-service-config/00-assert.yaml index 7301ab83c..2f7e527ab 100644 --- a/tests/kuttl/tests/dataplane-service-config/00-assert.yaml +++ b/tests/kuttl/tests/dataplane-service-config/00-assert.yaml @@ -100,7 +100,7 @@ spec: path: inventory secretName: dataplanenodeset-edpm-compute-no-nodes name: openstackansibleee - play: | + playbookContents: | - hosts: localhost gather_facts: no name: kuttl play diff --git a/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml b/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml index c361748b3..b27179bda 100644 --- a/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml +++ b/tests/kuttl/tests/dataplane-service-failure/00-assert.yaml @@ -53,7 +53,7 @@ spec: edpm_override_hosts: edpm-compute-no-nodes edpm_service_type: failed-service name: openstackansibleee - play: | + playbookContents: | - hosts: localhost gather_facts: no name: kuttl play