Merge pull request #1081 from fao89/libcommonjob

Use lib-common DoJob on AEE

apis/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml

@@ -65,6 +65,12 @@ spec:
                   type: string
                 minItems: 1
                 type: array
+              preserveJobs:
+                default: true
+                enum:
+                - true
+                - false
+                type: boolean
               servicesOverride:
                 items:
                   type: string
@@ -78,6 +84,10 @@ spec:
               rule: self == oldSelf
           status:
             properties:
+              ansibleEEHashes:
+                additionalProperties:
+                  type: string
+                type: object
               conditions:
                 items:
                   properties:

apis/dataplane/v1beta1/openstackdataplanedeployment_types.go

@@ -35,6 +35,12 @@ type OpenStackDataPlaneDeploymentSpec struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:number"}
 	BackoffLimit *int32 `json:"backoffLimit,omitempty"`
 
+	// PreserveJobs - do not delete jobs after they finished e.g. to check logs
+	// PreserveJobs default: true
+	// +kubebuilder:validation:Enum:=true;false
+	// +kubebuilder:default:=true
+	PreserveJobs bool `json:"preserveJobs,omitempty"`
+
 	// AnsibleTags for ansible execution
 	// +kubebuilder:validation:Optional
 	AnsibleTags string `json:"ansibleTags,omitempty"`
@@ -68,6 +74,9 @@ type OpenStackDataPlaneDeploymentStatus struct {
 	// NodeSetConditions
 	NodeSetConditions map[string]condition.Conditions `json:"nodeSetConditions,omitempty" optional:"true"`
 
+	// AnsibleEEHashes
+	AnsibleEEHashes map[string]string `json:"ansibleEEHashes,omitempty" optional:"true"`
+
 	// ConfigMapHashes
 	ConfigMapHashes map[string]string `json:"configMapHashes,omitempty" optional:"true"`
 
@@ -166,6 +175,9 @@ func (instance *OpenStackDataPlaneDeployment) InitHashesAndImages() {
 	if instance.Status.NodeSetHashes == nil {
 		instance.Status.NodeSetHashes = make(map[string]string)
 	}
+	if instance.Status.AnsibleEEHashes == nil {
+		instance.Status.AnsibleEEHashes = make(map[string]string)
+	}
 	if instance.Status.ContainerImages == nil {
 		instance.Status.ContainerImages = make(map[string]string)
 	}

config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml

@@ -65,6 +65,12 @@ spec:
                   type: string
                 minItems: 1
                 type: array
+              preserveJobs:
+                default: true
+                enum:
+                - true
+                - false
+                type: boolean
               servicesOverride:
                 items:
                   type: string
@@ -78,6 +84,10 @@ spec:
               rule: self == oldSelf
           status:
             properties:
+              ansibleEEHashes:
+                additionalProperties:
+                  type: string
+                type: object
               conditions:
                 items:
                   properties:

docs/assemblies/ctlplane_resources.adoc

@@ -41,6 +41,7 @@
 * <<ovnsection,OvnSection>>
 * <<placementsection,PlacementSection>>
 * <<rabbitmqsection,RabbitmqSection>>
+* <<redissection,RedisSection>>
 * <<swiftsection,SwiftSection>>
 * <<tlscastatus,TLSCAStatus>>
 * <<tlsingressconfig,TLSIngressConfig>>
@@ -1323,6 +1324,11 @@ OpenStackControlPlaneSpec defines the desired state of OpenStackControlPlane
 | <<barbicansection,BarbicanSection>>
 | false
 
+| redis
+| Redis - Parameters related to the Redis service
+| <<redissection,RedisSection>>
+| false
+
 | openstackclient
 | OpenStackClient - Parameters related to the OpenStackClient
 | <<openstackclientsection,OpenStackClientSection>>
@@ -1518,6 +1524,27 @@ RabbitmqSection defines the desired state of RabbitMQ service
 
 <<custom-resources,Back to Custom Resources>>
 
+[#redissection]
+==== RedisSection
+
+RedisSection defines the desired state of the Redis service
+
+|===
+| Field | Description | Scheme | Required
+
+| enabled
+| Enabled - Whether the Redis service should be deployed and managed
+| bool
+| true
+
+| templates
+| Templates - Overrides to use when creating the Redis Resources
+| *map[string]redisv1.RedisSpecCore
+| false
+|===
+
+<<custom-resources,Back to Custom Resources>>
+
 [#swiftsection]
 ==== SwiftSection
 
@@ -1730,6 +1757,16 @@ ContainerImages - struct acts as the source of truth for container image URLs to
 |===
 | Field | Description | Scheme | Required
 
+| octaviaApacheImage
+|
+| *string
+| false
+
+| ceilometerProxyImage
+|
+| *string
+| false
+
 | cinderVolumeImages
 | CinderVolumeImages custom Cinder Volume images for each backend (default Cinder volume image is stored 'default' key)
 | map[string]*string
@@ -1782,7 +1819,7 @@ ContainerTemplate - struct that contains container image URLs for each service i
 | false
 
 | apacheImage
-|
+| this is shared by BaremetalOperator, OctaviaOperator, and TelemetryOperator
 | *string
 | false
 
@@ -1826,11 +1863,6 @@ ContainerTemplate - struct that contains container image URLs for each service i
 | *string
 | false
 
-| ceilometerProxyImage
-|
-| *string
-| false
-
 | cinderAPIImage
 |
 | *string
@@ -1966,6 +1998,16 @@ ContainerTemplate - struct that contains container image URLs for each service i
 | *string
 | false
 
+| infraRedisImage
+|
+| *string
+| false
+
+| infraInstanceHaImage
+|
+| *string
+| false
+
 | ironicAPIImage
 |
 | *string
@@ -4545,6 +4587,11 @@ DesignateAPISpecBase -
 | Override, provides the ability to override the generated manifest of several child resources.
 | <<apioverridespec,APIOverrideSpec>>
 | false
+
+| tls
+| TLS - Parameters related to the TLS
+| tls.API
+| false
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -4778,6 +4825,11 @@ DesignateCentralSpecBase -
 | ServiceAccount - service account name used internally to provide Designate services the default SA name
 | string
 | true
+
+| tls
+| TLS - Parameters related to the TLS
+| tls.Ca
+| false
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -4873,11 +4925,6 @@ DesignateMdnsSpecBase -
 |===
 | Field | Description | Scheme | Required
 
-| replicas
-| Replicas - Designate Mdns Replicas
-| *int32
-| true
-
 | databaseHostname
 | DatabaseHostname - Designate Database Hostname
 | string
@@ -4892,6 +4939,11 @@ DesignateMdnsSpecBase -
 | ServiceAccount - service account name used internally to provide Designate services the default SA name
 | string
 | true
+
+| tls
+| TLS - Parameters related to the TLS
+| tls.Ca
+| false
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -4909,6 +4961,11 @@ DesignateMdnsStatus defines the observed state of DesignateMdns
 | int32
 | false
 
+| desiredNumberScheduled
+| DesiredNumberScheduled - total number of the nodes which should be running Daemon
+| int32
+| false
+
 | hash
 | Map of hashes to track e.g. job status
 | map[string]string
@@ -5006,6 +5063,11 @@ DesignateProducerSpec defines the desired state of DesignateProducer
 | ServiceAccount - service account name used internally to provide Designate services the default SA name
 | string
 | true
+
+| tls
+| TLS - Parameters related to the TLS
+| tls.Ca
+| false
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -5224,6 +5286,11 @@ DesignateWorkerSpecBase -
 | ServiceAccount - service account name used internally to provide Designate services the default SA name
 | string
 | true
+
+| tls
+| TLS - Parameters related to the TLS
+| tls.Ca
+| false
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -6738,6 +6805,11 @@ HorizonSpecBase -
 | ExtraMounts containing conf files
 | []<<horizonextravolmounts,HorizonExtraVolMounts>>
 | false
+
+| networkAttachments
+| NetworkAttachments is a list of NetworkAttachment resource names to expose the services to the given network
+| []string
+| false
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -6774,6 +6846,11 @@ HorizonStatus defines the observed state of Horizon
 | ObservedGeneration - the most recent generation observed for this service. If the observed generation is less than the spec generation, then the controller has not processed the latest changes injected by the opentack-operator in the top-level CR (e.g. the ContainerImage)
 | int64
 | false
+
+| networkAttachments
+| NetworkAttachments status of the deployment pods
+| map[string][]string
+| false
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -10063,6 +10140,11 @@ PasswordSelector to identify the DB and AdminUser password from the Secret
 | MetadataSecret - the name of the field to get the metadata secret from the Secret
 | string
 | true
+
+| prefixMetadataCellsSecret
+| prefixMetadataCellsSecret - the prefix name of the field to get the metadata secret from the Secret for cells. Vale of metadata_proxy_shared_secret information for the nova-metadata service. This secret is shared between nova and neutron ovn-metadata inside selected cell and if this is not defined the global metadata_proxy_shared_secret secret will be used
+| string
+| true
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -13412,6 +13494,11 @@ OpenStackProvisionServerSpec defines the desired state of OpenStackProvisionServ
 | string
 | true
 
+| osImageDir
+| OSImageDir - Directory on the container which holds the OS qcow2 image and checksum
+| *string
+| true
+
 | osContainerImageUrl
 | OSContainerImageURL - Container image URL for init with the OS qcow2 image (osImage)
 | string
@@ -13436,6 +13523,11 @@ OpenStackProvisionServerSpec defines the desired state of OpenStackProvisionServ
 | Resources - Compute Resources required by this provision server (Limits/Requests). https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
 | corev1.ResourceRequirements
 | false
+
+| preserveJobs
+| PreserveJobs - do not delete jobs after they finished e.g. to check logs
+| bool
+| true
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -13472,6 +13564,21 @@ OpenStackProvisionServerStatus defines the observed state of OpenStackProvisionS
 | URL of provisioning image on underlying Apache web server
 | string
 | false
+
+| osImageChecksumFilename
+| Filename of OSImage checksum
+| string
+| false
+
+| osImageChecksumType
+| OSImage checksum type
+| metal3v1.ChecksumType
+| false
+
+| localImageChecksumUrl
+| URL of provisioning image checksum on underlying Apache web server
+| string
+| false
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -15634,7 +15741,7 @@ Storage defines the options used for storage of metrics
 | Field | Description | Scheme | Required
 
 | strategy
-| Strategy to use for storage. Can be "persistent" or empty, in which case a COO default is used
+| Strategy to use for storage. Can be "persistent", "ephemeral" or empty, in which case a COO default is used
 | string
 | true
 
@@ -15645,8 +15752,8 @@ Storage defines the options used for storage of metrics
 
 | persistent
 | Used to specify the options of persistent storage when strategy = "persistent"
-| <<persistentstorage,PersistentStorage>>
-| true
+| *<<persistentstorage,PersistentStorage>>
+| false
 |===
 
 <<custom-resources,Back to Custom Resources>>
@@ -15980,6 +16087,11 @@ MemcachedSpecCore - this version is used by the OpenStackControlplane CR (no con
 | *int32
 | true
 
+| nodeSelector
+| NodeSelector to target subset of worker nodes running this service
+| map[string]string
+| false
+
 | tls
 | TLS settings for memcached service
 | tls.SimpleService