Merge pull request #285 from jpodivin/fix-role-comment

Removing last remnants of the old API
openstack-k8s-operators · Jan 2, 2024 · 83eb060 · 83eb060
2 parents a1220e2 + e85fbb3
commit 83eb060
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/api/v1beta1/openstack_ansibleee_types.go b/api/v1beta1/openstack_ansibleee_types.go
@@ -53,7 +53,6 @@ type OpenStackAnsibleEESpec struct {
 	// Important: Run "make" to regenerate code after modifying this file
 
 	// Play is an inline playbook contents that ansible will run on execution.
-	// If both Play and Roles are specified, Play takes precedence
 	Play string `json:"play,omitempty"`
 	// Playbook is the playbook that ansible will run on this execution, accepts path or FQN from collection
 	Playbook string `json:"playbook,omitempty"`

diff --git a/docs/openstack_ansibleee.md b/docs/openstack_ansibleee.md
@@ -50,7 +50,7 @@ OpenStackAnsibleEESpec defines the desired state of OpenStackAnsibleEE
 
 | Field | Description | Scheme | Required |
 | ----- | ----------- | ------ | -------- |
-| play | Play is an inline playbook contents that ansible will run on execution. If both Play and Roles are specified, Play takes precedence | string | false |
+| play | Play is an inline playbook contents that ansible will run on execution. | string | false |
 | playbook | Playbook is the playbook that ansible will run on this execution, accepts path or FQN from collection | string | false |
 | image | Image is the container image that will execute the ansible command | string | false |
 | args | Args are the command plus the playbook executed by the image. If args is passed, Playbook is ignored. | []string | false |