diff --git a/sdk/dotnet/BlockStorage/GetVolumeV3.cs b/sdk/dotnet/BlockStorage/GetVolumeV3.cs index 037264822..eb4175ca2 100644 --- a/sdk/dotnet/BlockStorage/GetVolumeV3.cs +++ b/sdk/dotnet/BlockStorage/GetVolumeV3.cs @@ -202,10 +202,6 @@ public sealed class GetVolumeV3Result /// public readonly ImmutableDictionary Metadata; /// - /// Indicates if the volume can be attached to more then one server. - /// - public readonly bool Multiattach; - /// /// See Argument Reference above. /// public readonly string Name; @@ -242,8 +238,6 @@ private GetVolumeV3Result( ImmutableDictionary metadata, - bool multiattach, - string name, string region, @@ -261,7 +255,6 @@ private GetVolumeV3Result( Host = host; Id = id; Metadata = metadata; - Multiattach = multiattach; Name = name; Region = region; Size = size; diff --git a/sdk/dotnet/BlockStorage/Volume.cs b/sdk/dotnet/BlockStorage/Volume.cs index 7b43da464..06aed1151 100644 --- a/sdk/dotnet/BlockStorage/Volume.cs +++ b/sdk/dotnet/BlockStorage/Volume.cs @@ -104,12 +104,6 @@ public partial class Volume : global::Pulumi.CustomResource [Output("metadata")] public Output> Metadata { get; private set; } = null!; - /// - /// (Optional) Allow the volume to be attached to more than one Compute instance. - /// - [Output("multiattach")] - public Output Multiattach { get; private set; } = null!; - /// /// A unique name for the volume. Changing this updates the /// volume's name. @@ -271,12 +265,6 @@ public InputMap Metadata set => _metadata = value; } - /// - /// (Optional) Allow the volume to be attached to more than one Compute instance. - /// - [Input("multiattach")] - public Input? Multiattach { get; set; } - /// /// A unique name for the volume. Changing this updates the /// volume's name. @@ -420,12 +408,6 @@ public InputMap Metadata set => _metadata = value; } - /// - /// (Optional) Allow the volume to be attached to more than one Compute instance. - /// - [Input("multiattach")] - public Input? Multiattach { get; set; } - /// /// A unique name for the volume. Changing this updates the /// volume's name. diff --git a/sdk/dotnet/BlockStorage/VolumeAttachV2.cs b/sdk/dotnet/BlockStorage/VolumeAttachV2.cs index b930dd842..aff14772a 100644 --- a/sdk/dotnet/BlockStorage/VolumeAttachV2.cs +++ b/sdk/dotnet/BlockStorage/VolumeAttachV2.cs @@ -123,9 +123,6 @@ public partial class VolumeAttachV2 : global::Pulumi.CustomResource [Output("initiator")] public Output Initiator { get; private set; } = null!; - [Output("instanceId")] - public Output InstanceId { get; private set; } = null!; - /// /// The IP address of the `host_name` above. /// @@ -262,9 +259,6 @@ public sealed class VolumeAttachV2Args : global::Pulumi.ResourceArgs [Input("initiator")] public Input? Initiator { get; set; } - [Input("instanceId")] - public Input? InstanceId { get; set; } - /// /// The IP address of the `host_name` above. /// @@ -383,9 +377,6 @@ public InputMap Data [Input("initiator")] public Input? Initiator { get; set; } - [Input("instanceId")] - public Input? InstanceId { get; set; } - /// /// The IP address of the `host_name` above. /// diff --git a/sdk/dotnet/BlockStorage/VolumeTypeV3.cs b/sdk/dotnet/BlockStorage/VolumeTypeV3.cs index acf2cdbef..ced23d7d4 100644 --- a/sdk/dotnet/BlockStorage/VolumeTypeV3.cs +++ b/sdk/dotnet/BlockStorage/VolumeTypeV3.cs @@ -16,6 +16,8 @@ namespace Pulumi.OpenStack.BlockStorage /// /// ## Example Usage /// + /// ### Basic Volume Type + /// /// ```csharp /// using System.Collections.Generic; /// using System.Linq; @@ -38,6 +40,29 @@ namespace Pulumi.OpenStack.BlockStorage /// }); /// ``` /// + /// ### Volume Type with multiattach enabled + /// + /// ```csharp + /// using System.Collections.Generic; + /// using System.Linq; + /// using Pulumi; + /// using OpenStack = Pulumi.OpenStack; + /// + /// return await Deployment.RunAsync(() => + /// { + /// var multiattach = new OpenStack.BlockStorage.VolumeTypeV3("multiattach", new() + /// { + /// Name = "multiattach", + /// Description = "Multiattach-enabled volume type", + /// ExtraSpecs = + /// { + /// { "multiattach", "<is> True" }, + /// }, + /// }); + /// + /// }); + /// ``` + /// /// ## Import /// /// Volume types can be imported using the `volume_type_id`, e.g. diff --git a/sdk/dotnet/Compute/Inputs/InstanceNetworkArgs.cs b/sdk/dotnet/Compute/Inputs/InstanceNetworkArgs.cs index 8aab98be4..6adaeef11 100644 --- a/sdk/dotnet/Compute/Inputs/InstanceNetworkArgs.cs +++ b/sdk/dotnet/Compute/Inputs/InstanceNetworkArgs.cs @@ -29,9 +29,6 @@ public sealed class InstanceNetworkArgs : global::Pulumi.ResourceArgs [Input("fixedIpV6")] public Input? FixedIpV6 { get; set; } - [Input("floatingIp")] - public Input? FloatingIp { get; set; } - [Input("mac")] public Input? Mac { get; set; } diff --git a/sdk/dotnet/Compute/Inputs/InstanceNetworkGetArgs.cs b/sdk/dotnet/Compute/Inputs/InstanceNetworkGetArgs.cs index 1ec528a5e..043f5779c 100644 --- a/sdk/dotnet/Compute/Inputs/InstanceNetworkGetArgs.cs +++ b/sdk/dotnet/Compute/Inputs/InstanceNetworkGetArgs.cs @@ -29,9 +29,6 @@ public sealed class InstanceNetworkGetArgs : global::Pulumi.ResourceArgs [Input("fixedIpV6")] public Input? FixedIpV6 { get; set; } - [Input("floatingIp")] - public Input? FloatingIp { get; set; } - [Input("mac")] public Input? Mac { get; set; } diff --git a/sdk/dotnet/Compute/Inputs/InstanceSchedulerHintArgs.cs b/sdk/dotnet/Compute/Inputs/InstanceSchedulerHintArgs.cs index f66c45572..745f60103 100644 --- a/sdk/dotnet/Compute/Inputs/InstanceSchedulerHintArgs.cs +++ b/sdk/dotnet/Compute/Inputs/InstanceSchedulerHintArgs.cs @@ -59,7 +59,8 @@ public InputList DifferentHosts /// /// A UUID of a Server Group. The instance will be placed - /// into that group. + /// into that group. See reference + /// for details on managing servergroup resources /// [Input("group")] public Input? Group { get; set; } diff --git a/sdk/dotnet/Compute/Inputs/InstanceSchedulerHintGetArgs.cs b/sdk/dotnet/Compute/Inputs/InstanceSchedulerHintGetArgs.cs index 0842c90ea..a54610bb1 100644 --- a/sdk/dotnet/Compute/Inputs/InstanceSchedulerHintGetArgs.cs +++ b/sdk/dotnet/Compute/Inputs/InstanceSchedulerHintGetArgs.cs @@ -59,7 +59,8 @@ public InputList DifferentHosts /// /// A UUID of a Server Group. The instance will be placed - /// into that group. + /// into that group. See reference + /// for details on managing servergroup resources /// [Input("group")] public Input? Group { get; set; } diff --git a/sdk/dotnet/Compute/Inputs/InstanceVolumeArgs.cs b/sdk/dotnet/Compute/Inputs/InstanceVolumeArgs.cs deleted file mode 100644 index ef6271dea..000000000 --- a/sdk/dotnet/Compute/Inputs/InstanceVolumeArgs.cs +++ /dev/null @@ -1,29 +0,0 @@ -// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** -// *** Do not edit by hand unless you're certain you know what you are doing! *** - -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Threading.Tasks; -using Pulumi.Serialization; - -namespace Pulumi.OpenStack.Compute.Inputs -{ - - public sealed class InstanceVolumeArgs : global::Pulumi.ResourceArgs - { - [Input("device")] - public Input? Device { get; set; } - - [Input("id")] - public Input? Id { get; set; } - - [Input("volumeId", required: true)] - public Input VolumeId { get; set; } = null!; - - public InstanceVolumeArgs() - { - } - public static new InstanceVolumeArgs Empty => new InstanceVolumeArgs(); - } -} diff --git a/sdk/dotnet/Compute/Inputs/InstanceVolumeGetArgs.cs b/sdk/dotnet/Compute/Inputs/InstanceVolumeGetArgs.cs deleted file mode 100644 index fab58cf73..000000000 --- a/sdk/dotnet/Compute/Inputs/InstanceVolumeGetArgs.cs +++ /dev/null @@ -1,29 +0,0 @@ -// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** -// *** Do not edit by hand unless you're certain you know what you are doing! *** - -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Threading.Tasks; -using Pulumi.Serialization; - -namespace Pulumi.OpenStack.Compute.Inputs -{ - - public sealed class InstanceVolumeGetArgs : global::Pulumi.ResourceArgs - { - [Input("device")] - public Input? Device { get; set; } - - [Input("id")] - public Input? Id { get; set; } - - [Input("volumeId", required: true)] - public Input VolumeId { get; set; } = null!; - - public InstanceVolumeGetArgs() - { - } - public static new InstanceVolumeGetArgs Empty => new InstanceVolumeGetArgs(); - } -} diff --git a/sdk/dotnet/Compute/Instance.cs b/sdk/dotnet/Compute/Instance.cs index 40f40437a..4cd564023 100644 --- a/sdk/dotnet/Compute/Instance.cs +++ b/sdk/dotnet/Compute/Instance.cs @@ -98,9 +98,6 @@ public partial class Instance : global::Pulumi.CustomResource [Output("flavorName")] public Output FlavorName { get; private set; } = null!; - [Output("floatingIp")] - public Output FloatingIp { get; private set; } = null!; - /// /// Whether to force the OpenStack instance to be /// forcefully deleted. This is useful for environments that have reclaim / soft @@ -242,9 +239,6 @@ public partial class Instance : global::Pulumi.CustomResource [Output("vendorOptions")] public Output VendorOptions { get; private set; } = null!; - [Output("volumes")] - public Output> Volumes { get; private set; } = null!; - /// /// Create a Instance resource with the given unique name, arguments, and options. @@ -381,9 +375,6 @@ public InputList BlockDevices [Input("flavorName")] public Input? FlavorName { get; set; } - [Input("floatingIp")] - public Input? FloatingIp { get; set; } - /// /// Whether to force the OpenStack instance to be /// forcefully deleted. This is useful for environments that have reclaim / soft @@ -555,15 +546,6 @@ public InputList Tags [Input("vendorOptions")] public Input? VendorOptions { get; set; } - [Input("volumes")] - private InputList? _volumes; - [Obsolete(@"Use block_device or openstack.compute.VolumeAttach instead")] - public InputList Volumes - { - get => _volumes ?? (_volumes = new InputList()); - set => _volumes = value; - } - public InstanceArgs() { } @@ -685,9 +667,6 @@ public InputList BlockDevices [Input("flavorName")] public Input? FlavorName { get; set; } - [Input("floatingIp")] - public Input? FloatingIp { get; set; } - /// /// Whether to force the OpenStack instance to be /// forcefully deleted. This is useful for environments that have reclaim / soft @@ -865,15 +844,6 @@ public InputList Tags [Input("vendorOptions")] public Input? VendorOptions { get; set; } - [Input("volumes")] - private InputList? _volumes; - [Obsolete(@"Use block_device or openstack.compute.VolumeAttach instead")] - public InputList Volumes - { - get => _volumes ?? (_volumes = new InputList()); - set => _volumes = value; - } - public InstanceState() { } diff --git a/sdk/dotnet/Compute/Outputs/InstanceNetwork.cs b/sdk/dotnet/Compute/Outputs/InstanceNetwork.cs index a39422cc6..383d752a6 100644 --- a/sdk/dotnet/Compute/Outputs/InstanceNetwork.cs +++ b/sdk/dotnet/Compute/Outputs/InstanceNetwork.cs @@ -24,7 +24,6 @@ public sealed class InstanceNetwork /// public readonly string? FixedIpV4; public readonly string? FixedIpV6; - public readonly string? FloatingIp; public readonly string? Mac; /// /// The human-readable @@ -50,8 +49,6 @@ private InstanceNetwork( string? fixedIpV6, - string? floatingIp, - string? mac, string? name, @@ -63,7 +60,6 @@ private InstanceNetwork( AccessNetwork = accessNetwork; FixedIpV4 = fixedIpV4; FixedIpV6 = fixedIpV6; - FloatingIp = floatingIp; Mac = mac; Name = name; Port = port; diff --git a/sdk/dotnet/Compute/Outputs/InstanceSchedulerHint.cs b/sdk/dotnet/Compute/Outputs/InstanceSchedulerHint.cs index ae1178ee0..53480e8bd 100644 --- a/sdk/dotnet/Compute/Outputs/InstanceSchedulerHint.cs +++ b/sdk/dotnet/Compute/Outputs/InstanceSchedulerHint.cs @@ -34,7 +34,8 @@ public sealed class InstanceSchedulerHint public readonly ImmutableArray DifferentHosts; /// /// A UUID of a Server Group. The instance will be placed - /// into that group. + /// into that group. See reference + /// for details on managing servergroup resources /// public readonly string? Group; /// diff --git a/sdk/dotnet/Compute/Outputs/InstanceVolume.cs b/sdk/dotnet/Compute/Outputs/InstanceVolume.cs deleted file mode 100644 index 614fb106f..000000000 --- a/sdk/dotnet/Compute/Outputs/InstanceVolume.cs +++ /dev/null @@ -1,33 +0,0 @@ -// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** -// *** Do not edit by hand unless you're certain you know what you are doing! *** - -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Threading.Tasks; -using Pulumi.Serialization; - -namespace Pulumi.OpenStack.Compute.Outputs -{ - - [OutputType] - public sealed class InstanceVolume - { - public readonly string? Device; - public readonly string? Id; - public readonly string VolumeId; - - [OutputConstructor] - private InstanceVolume( - string? device, - - string? id, - - string volumeId) - { - Device = device; - Id = id; - VolumeId = volumeId; - } - } -} diff --git a/sdk/dotnet/Compute/ServerGroup.cs b/sdk/dotnet/Compute/ServerGroup.cs index baa7b20ae..b1872ae98 100644 --- a/sdk/dotnet/Compute/ServerGroup.cs +++ b/sdk/dotnet/Compute/ServerGroup.cs @@ -33,6 +33,27 @@ namespace Pulumi.OpenStack.Compute /// }, /// }); /// + /// var test_instance = new OpenStack.Compute.Instance("test-instance", new() + /// { + /// Name = "my-instance", + /// ImageId = "ad091b52-742f-469e-8f3c-fd81cadf0743", + /// FlavorId = "3", + /// SchedulerHints = new[] + /// { + /// new OpenStack.Compute.Inputs.InstanceSchedulerHintArgs + /// { + /// Group = test_sg.Id, + /// }, + /// }, + /// Networks = new[] + /// { + /// new OpenStack.Compute.Inputs.InstanceNetworkArgs + /// { + /// Name = "my_network", + /// }, + /// }, + /// }); + /// /// }); /// ``` /// @@ -59,6 +80,27 @@ namespace Pulumi.OpenStack.Compute /// }, /// }); /// + /// var test_instance = new OpenStack.Compute.Instance("test-instance", new() + /// { + /// Name = "my-instance", + /// ImageId = "ad091b52-742f-469e-8f3c-fd81cadf0743", + /// FlavorId = "3", + /// SchedulerHints = new[] + /// { + /// new OpenStack.Compute.Inputs.InstanceSchedulerHintArgs + /// { + /// Group = test_sg.Id, + /// }, + /// }, + /// Networks = new[] + /// { + /// new OpenStack.Compute.Inputs.InstanceNetworkArgs + /// { + /// Name = "my_network", + /// }, + /// }, + /// }); + /// /// }); /// ``` /// diff --git a/sdk/dotnet/Compute/VolumeAttach.cs b/sdk/dotnet/Compute/VolumeAttach.cs index 4e2e8c893..33b09e989 100644 --- a/sdk/dotnet/Compute/VolumeAttach.cs +++ b/sdk/dotnet/Compute/VolumeAttach.cs @@ -52,7 +52,7 @@ namespace Pulumi.OpenStack.Compute /// ### Using Multiattach-enabled volumes /// /// Multiattach Volumes are dependent upon your OpenStack cloud and not all - /// clouds support multiattach. + /// clouds support multiattach. Multiattach volumes require a volume_type that has [multiattach enabled](https://docs.openstack.org/cinder/latest/admin/volume-multiattach.html#multiattach-volume-type). /// /// ```csharp /// using System.Collections.Generic; @@ -66,7 +66,7 @@ namespace Pulumi.OpenStack.Compute /// { /// Name = "volume_1", /// Size = 1, - /// Multiattach = true, + /// VolumeType = "multiattach", /// }); /// /// var instance1 = new OpenStack.Compute.Instance("instance_1", new() @@ -149,6 +149,14 @@ public partial class VolumeAttach : global::Pulumi.CustomResource [Output("region")] public Output Region { get; private set; } = null!; + /// + /// Add a device role tag that is applied to the volume when + /// attaching it to the VM. Changing this creates a new volume attachment with + /// the new tag. Requires microversion >= 2.49. + /// + [Output("tag")] + public Output Tag { get; private set; } = null!; + /// /// Map of additional vendor-specific options. /// Supported options are described below. @@ -232,6 +240,14 @@ public sealed class VolumeAttachArgs : global::Pulumi.ResourceArgs [Input("region")] public Input? Region { get; set; } + /// + /// Add a device role tag that is applied to the volume when + /// attaching it to the VM. Changing this creates a new volume attachment with + /// the new tag. Requires microversion >= 2.49. + /// + [Input("tag")] + public Input? Tag { get; set; } + /// /// Map of additional vendor-specific options. /// Supported options are described below. @@ -277,6 +293,14 @@ public sealed class VolumeAttachState : global::Pulumi.ResourceArgs [Input("region")] public Input? Region { get; set; } + /// + /// Add a device role tag that is applied to the volume when + /// attaching it to the VM. Changing this creates a new volume attachment with + /// the new tag. Requires microversion >= 2.49. + /// + [Input("tag")] + public Input? Tag { get; set; } + /// /// Map of additional vendor-specific options. /// Supported options are described below. diff --git a/sdk/dotnet/Config/Config.cs b/sdk/dotnet/Config/Config.cs index e885f88a7..964047e6a 100644 --- a/sdk/dotnet/Config/Config.cs +++ b/sdk/dotnet/Config/Config.cs @@ -311,16 +311,6 @@ public static string? Token set => _token.Set(value); } - private static readonly __Value _useOctavia = new __Value(() => __config.GetBoolean("useOctavia") ?? Utilities.GetEnvBoolean("OS_USE_OCTAVIA")); - /// - /// If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron). - /// - public static bool? UseOctavia - { - get => _useOctavia.Get(); - set => _useOctavia.Set(value); - } - private static readonly __Value _userDomainId = new __Value(() => __config.Get("userDomainId")); /// /// The ID of the domain where the user resides (Identity v3). diff --git a/sdk/dotnet/Images/GetImage.cs b/sdk/dotnet/Images/GetImage.cs index 52df68770..9cfc255fe 100644 --- a/sdk/dotnet/Images/GetImage.cs +++ b/sdk/dotnet/Images/GetImage.cs @@ -153,16 +153,14 @@ public Dictionary Properties public int? SizeMin { get; set; } /// - /// Order the results in either `asc` or `desc`. + /// Sorts the response by one or more attribute and sort + /// direction combinations. You can also set multiple sort keys and directions. + /// Default direction is `desc`. Use the comma (,) character to separate + /// multiple values. For example expression `sort = "name:asc,status"` + /// sorts ascending by name and descending by status. /// - [Input("sortDirection")] - public string? SortDirection { get; set; } - - /// - /// Sort images based on a certain key. Defaults to `name`. - /// - [Input("sortKey")] - public string? SortKey { get; set; } + [Input("sort")] + public string? Sort { get; set; } /// /// Search for images with a specific tag. @@ -278,16 +276,14 @@ public InputMap Properties public Input? SizeMin { get; set; } /// - /// Order the results in either `asc` or `desc`. + /// Sorts the response by one or more attribute and sort + /// direction combinations. You can also set multiple sort keys and directions. + /// Default direction is `desc`. Use the comma (,) character to separate + /// multiple values. For example expression `sort = "name:asc,status"` + /// sorts ascending by name and descending by status. /// - [Input("sortDirection")] - public Input? SortDirection { get; set; } - - /// - /// Sort images based on a certain key. Defaults to `name`. - /// - [Input("sortKey")] - public Input? SortKey { get; set; } + [Input("sort")] + public Input? Sort { get; set; } /// /// Search for images with a specific tag. @@ -390,8 +386,7 @@ public sealed class GetImageResult public readonly int SizeBytes; public readonly int? SizeMax; public readonly int? SizeMin; - public readonly string? SortDirection; - public readonly string? SortKey; + public readonly string? Sort; public readonly string? Tag; /// /// The tags list of the image. @@ -449,9 +444,7 @@ private GetImageResult( int? sizeMin, - string? sortDirection, - - string? sortKey, + string? sort, string? tag, @@ -483,8 +476,7 @@ private GetImageResult( SizeBytes = sizeBytes; SizeMax = sizeMax; SizeMin = sizeMin; - SortDirection = sortDirection; - SortKey = sortKey; + Sort = sort; Tag = tag; Tags = tags; UpdatedAt = updatedAt; diff --git a/sdk/dotnet/Images/GetImageIds.cs b/sdk/dotnet/Images/GetImageIds.cs index 48c37fe96..54491f199 100644 --- a/sdk/dotnet/Images/GetImageIds.cs +++ b/sdk/dotnet/Images/GetImageIds.cs @@ -144,28 +144,11 @@ public Dictionary Properties /// direction combinations. You can also set multiple sort keys and directions. /// Default direction is `desc`. Use the comma (,) character to separate /// multiple values. For example expression `sort = "name:asc,status"` - /// sorts ascending by name and descending by status. `sort` cannot be used - /// simultaneously with `sort_key`. If both are present in a configuration - /// then only `sort` will be used. + /// sorts ascending by name and descending by status. /// [Input("sort")] public string? Sort { get; set; } - /// - /// Order the results in either `asc` or `desc`. - /// Can be applied only with `sort_key`. Defaults to `asc` - /// - [Input("sortDirection")] - public string? SortDirection { get; set; } - - /// - /// Sort images based on a certain key. Defaults to - /// `name`. `sort_key` cannot be used simultaneously with `sort`. If both - /// are present in a configuration then only `sort` will be used. - /// - [Input("sortKey")] - public string? SortKey { get; set; } - /// /// Search for images with a specific tag. /// @@ -269,28 +252,11 @@ public InputMap Properties /// direction combinations. You can also set multiple sort keys and directions. /// Default direction is `desc`. Use the comma (,) character to separate /// multiple values. For example expression `sort = "name:asc,status"` - /// sorts ascending by name and descending by status. `sort` cannot be used - /// simultaneously with `sort_key`. If both are present in a configuration - /// then only `sort` will be used. + /// sorts ascending by name and descending by status. /// [Input("sort")] public Input? Sort { get; set; } - /// - /// Order the results in either `asc` or `desc`. - /// Can be applied only with `sort_key`. Defaults to `asc` - /// - [Input("sortDirection")] - public Input? SortDirection { get; set; } - - /// - /// Sort images based on a certain key. Defaults to - /// `name`. `sort_key` cannot be used simultaneously with `sort`. If both - /// are present in a configuration then only `sort` will be used. - /// - [Input("sortKey")] - public Input? SortKey { get; set; } - /// /// Search for images with a specific tag. /// @@ -341,8 +307,6 @@ public sealed class GetImageIdsResult public readonly int? SizeMax; public readonly int? SizeMin; public readonly string? Sort; - public readonly string? SortDirection; - public readonly string? SortKey; public readonly string? Tag; public readonly ImmutableArray Tags; public readonly string? Visibility; @@ -371,10 +335,6 @@ private GetImageIdsResult( string? sort, - string? sortDirection, - - string? sortKey, - string? tag, ImmutableArray tags, @@ -392,8 +352,6 @@ private GetImageIdsResult( SizeMax = sizeMax; SizeMin = sizeMin; Sort = sort; - SortDirection = sortDirection; - SortKey = sortKey; Tag = tag; Tags = tags; Visibility = visibility; diff --git a/sdk/dotnet/Images/Image.cs b/sdk/dotnet/Images/Image.cs index 8e4a4e56b..a4860723f 100644 --- a/sdk/dotnet/Images/Image.cs +++ b/sdk/dotnet/Images/Image.cs @@ -242,12 +242,6 @@ public partial class Image : global::Pulumi.CustomResource [Output("tags")] public Output> Tags { get; private set; } = null!; - /// - /// (**Deprecated** - use `updated_at` instead) - /// - [Output("updateAt")] - public Output UpdateAt { get; private set; } = null!; - /// /// The date the image was last updated. /// @@ -704,12 +698,6 @@ public InputList Tags set => _tags = value; } - /// - /// (**Deprecated** - use `updated_at` instead) - /// - [Input("updateAt")] - public Input? UpdateAt { get; set; } - /// /// The date the image was last updated. /// diff --git a/sdk/dotnet/LoadBalancer/GetFlavorV2.cs b/sdk/dotnet/LoadBalancer/GetFlavorV2.cs new file mode 100644 index 000000000..553434828 --- /dev/null +++ b/sdk/dotnet/LoadBalancer/GetFlavorV2.cs @@ -0,0 +1,96 @@ +// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +using System; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Threading.Tasks; +using Pulumi.Serialization; + +namespace Pulumi.OpenStack.LoadBalancer +{ + public static class GetFlavorV2 + { + public static Task InvokeAsync(GetFlavorV2Args? args = null, InvokeOptions? options = null) + => global::Pulumi.Deployment.Instance.InvokeAsync("openstack:loadbalancer/getFlavorV2:getFlavorV2", args ?? new GetFlavorV2Args(), options.WithDefaults()); + + public static Output Invoke(GetFlavorV2InvokeArgs? args = null, InvokeOptions? options = null) + => global::Pulumi.Deployment.Instance.Invoke("openstack:loadbalancer/getFlavorV2:getFlavorV2", args ?? new GetFlavorV2InvokeArgs(), options.WithDefaults()); + } + + + public sealed class GetFlavorV2Args : global::Pulumi.InvokeArgs + { + [Input("flavorId")] + public string? FlavorId { get; set; } + + [Input("name")] + public string? Name { get; set; } + + [Input("region")] + public string? Region { get; set; } + + public GetFlavorV2Args() + { + } + public static new GetFlavorV2Args Empty => new GetFlavorV2Args(); + } + + public sealed class GetFlavorV2InvokeArgs : global::Pulumi.InvokeArgs + { + [Input("flavorId")] + public Input? FlavorId { get; set; } + + [Input("name")] + public Input? Name { get; set; } + + [Input("region")] + public Input? Region { get; set; } + + public GetFlavorV2InvokeArgs() + { + } + public static new GetFlavorV2InvokeArgs Empty => new GetFlavorV2InvokeArgs(); + } + + + [OutputType] + public sealed class GetFlavorV2Result + { + public readonly string Description; + public readonly bool Enabled; + public readonly string FlavorId; + public readonly string FlavorProfileId; + /// + /// The provider-assigned unique ID for this managed resource. + /// + public readonly string Id; + public readonly string Name; + public readonly string? Region; + + [OutputConstructor] + private GetFlavorV2Result( + string description, + + bool enabled, + + string flavorId, + + string flavorProfileId, + + string id, + + string name, + + string? region) + { + Description = description; + Enabled = enabled; + FlavorId = flavorId; + FlavorProfileId = flavorProfileId; + Id = id; + Name = name; + Region = region; + } + } +} diff --git a/sdk/dotnet/LoadBalancer/Listener.cs b/sdk/dotnet/LoadBalancer/Listener.cs index f384f16b8..824cc4b98 100644 --- a/sdk/dotnet/LoadBalancer/Listener.cs +++ b/sdk/dotnet/LoadBalancer/Listener.cs @@ -118,8 +118,8 @@ public partial class Listener : global::Pulumi.CustomResource /// /// The protocol - can either be TCP, HTTP, HTTPS, - /// TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only - /// in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in + /// TERMINATED_HTTPS, UDP, SCTP (supported only in + /// **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in /// **Octavia minor version >=2.25**). Changing this creates a new Listener. /// [Output("protocol")] @@ -312,8 +312,8 @@ public InputMap InsertHeaders /// /// The protocol - can either be TCP, HTTP, HTTPS, - /// TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only - /// in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in + /// TERMINATED_HTTPS, UDP, SCTP (supported only in + /// **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in /// **Octavia minor version >=2.25**). Changing this creates a new Listener. /// [Input("protocol", required: true)] @@ -479,8 +479,8 @@ public InputMap InsertHeaders /// /// The protocol - can either be TCP, HTTP, HTTPS, - /// TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only - /// in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in + /// TERMINATED_HTTPS, UDP, SCTP (supported only in + /// **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in /// **Octavia minor version >=2.25**). Changing this creates a new Listener. /// [Input("protocol")] diff --git a/sdk/dotnet/LoadBalancer/Members.cs b/sdk/dotnet/LoadBalancer/Members.cs index 38755e5bc..f799734c4 100644 --- a/sdk/dotnet/LoadBalancer/Members.cs +++ b/sdk/dotnet/LoadBalancer/Members.cs @@ -15,10 +15,6 @@ namespace Pulumi.OpenStack.LoadBalancer /// > **Note:** This resource has attributes that depend on octavia minor versions. /// Please ensure your Openstack cloud supports the required minor version. /// - /// > **Note:** This resource works only within Octavia API. For - /// legacy Neutron LBaaS v2 extension please use - /// openstack.loadbalancer.Member resource. - /// /// ## Example Usage /// /// ```csharp diff --git a/sdk/dotnet/LoadBalancer/Pool.cs b/sdk/dotnet/LoadBalancer/Pool.cs index 99a9c3a18..c151ef1ec 100644 --- a/sdk/dotnet/LoadBalancer/Pool.cs +++ b/sdk/dotnet/LoadBalancer/Pool.cs @@ -67,8 +67,7 @@ public partial class Pool : global::Pulumi.CustomResource /// /// The load balancing algorithm to /// distribute traffic to the pool's members. Must be one of - /// ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only - /// in Octavia). + /// ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT. /// [Output("lbMethod")] public Output LbMethod { get; private set; } = null!; @@ -105,8 +104,8 @@ public partial class Pool : global::Pulumi.CustomResource /// /// The protocol - can either be TCP, HTTP, HTTPS, PROXY, - /// UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**) - /// or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool. + /// UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP + /// (**Octavia minor version >= 2.23**). Changing this creates a new pool. /// [Output("protocol")] public Output Protocol { get; private set; } = null!; @@ -190,8 +189,7 @@ public sealed class PoolArgs : global::Pulumi.ResourceArgs /// /// The load balancing algorithm to /// distribute traffic to the pool's members. Must be one of - /// ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only - /// in Octavia). + /// ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT. /// [Input("lbMethod", required: true)] public Input LbMethod { get; set; } = null!; @@ -228,8 +226,8 @@ public sealed class PoolArgs : global::Pulumi.ResourceArgs /// /// The protocol - can either be TCP, HTTP, HTTPS, PROXY, - /// UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**) - /// or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool. + /// UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP + /// (**Octavia minor version >= 2.23**). Changing this creates a new pool. /// [Input("protocol", required: true)] public Input Protocol { get; set; } = null!; @@ -275,8 +273,7 @@ public sealed class PoolState : global::Pulumi.ResourceArgs /// /// The load balancing algorithm to /// distribute traffic to the pool's members. Must be one of - /// ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only - /// in Octavia). + /// ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT. /// [Input("lbMethod")] public Input? LbMethod { get; set; } @@ -313,8 +310,8 @@ public sealed class PoolState : global::Pulumi.ResourceArgs /// /// The protocol - can either be TCP, HTTP, HTTPS, PROXY, - /// UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**) - /// or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool. + /// UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP + /// (**Octavia minor version >= 2.23**). Changing this creates a new pool. /// [Input("protocol")] public Input? Protocol { get; set; } diff --git a/sdk/dotnet/LoadBalancer/PoolV1.cs b/sdk/dotnet/LoadBalancer/PoolV1.cs index 4dd6141aa..92f77fe4f 100644 --- a/sdk/dotnet/LoadBalancer/PoolV1.cs +++ b/sdk/dotnet/LoadBalancer/PoolV1.cs @@ -165,10 +165,6 @@ namespace Pulumi.OpenStack.LoadBalancer /// }); /// ``` /// - /// ## Notes - /// - /// The `member` block is deprecated in favor of the `openstack.loadbalancer.MemberV1` resource. - /// /// ## Import /// /// Load Balancer Pools can be imported using the `id`, e.g. @@ -195,15 +191,6 @@ public partial class PoolV1 : global::Pulumi.CustomResource [Output("lbProvider")] public Output LbProvider { get; private set; } = null!; - /// - /// An existing node to add to the pool. Changing this - /// updates the members of the pool. The member object structure is documented - /// below. Please note that the `member` block is deprecated in favor of the - /// `openstack.loadbalancer.MemberV1` resource. - /// - [Output("members")] - public Output> Members { get; private set; } = null!; - /// /// A list of IDs of monitors to associate with the /// pool. @@ -310,22 +297,6 @@ public sealed class PoolV1Args : global::Pulumi.ResourceArgs [Input("lbProvider")] public Input? LbProvider { get; set; } - [Input("members")] - private InputList? _members; - - /// - /// An existing node to add to the pool. Changing this - /// updates the members of the pool. The member object structure is documented - /// below. Please note that the `member` block is deprecated in favor of the - /// `openstack.loadbalancer.MemberV1` resource. - /// - [Obsolete(@"Use openstack.loadbalancer.MemberV1 instead")] - public InputList Members - { - get => _members ?? (_members = new InputList()); - set => _members = value; - } - [Input("monitorIds")] private InputList? _monitorIds; @@ -400,22 +371,6 @@ public sealed class PoolV1State : global::Pulumi.ResourceArgs [Input("lbProvider")] public Input? LbProvider { get; set; } - [Input("members")] - private InputList? _members; - - /// - /// An existing node to add to the pool. Changing this - /// updates the members of the pool. The member object structure is documented - /// below. Please note that the `member` block is deprecated in favor of the - /// `openstack.loadbalancer.MemberV1` resource. - /// - [Obsolete(@"Use openstack.loadbalancer.MemberV1 instead")] - public InputList Members - { - get => _members ?? (_members = new InputList()); - set => _members = value; - } - [Input("monitorIds")] private InputList? _monitorIds; diff --git a/sdk/dotnet/LoadBalancer/Quota.cs b/sdk/dotnet/LoadBalancer/Quota.cs index 3971972cd..fd2f82d38 100644 --- a/sdk/dotnet/LoadBalancer/Quota.cs +++ b/sdk/dotnet/LoadBalancer/Quota.cs @@ -14,8 +14,6 @@ namespace Pulumi.OpenStack.LoadBalancer /// /// > **Note:** This usually requires admin privileges. /// - /// > **Note:** This resource is only available for Octavia. - /// /// > **Note:** This resource has a no-op deletion so no actual actions will be done against the OpenStack /// API in case of delete call. /// diff --git a/sdk/dotnet/Networking/GetFloatingIp.cs b/sdk/dotnet/Networking/GetFloatingIp.cs index 8c928fce9..5ad8f4ee0 100644 --- a/sdk/dotnet/Networking/GetFloatingIp.cs +++ b/sdk/dotnet/Networking/GetFloatingIp.cs @@ -82,7 +82,7 @@ public sealed class GetFloatingIpArgs : global::Pulumi.InvokeArgs public string? FixedIp { get; set; } /// - /// The name of the pool from which the floating IP belongs to. + /// The ID of the network from which the floating IP belongs to. /// [Input("pool")] public string? Pool { get; set; } @@ -152,7 +152,7 @@ public sealed class GetFloatingIpInvokeArgs : global::Pulumi.InvokeArgs public Input? FixedIp { get; set; } /// - /// The name of the pool from which the floating IP belongs to. + /// The ID of the network from which the floating IP belongs to. /// [Input("pool")] public Input? Pool { get; set; } diff --git a/sdk/dotnet/Networking/GetSubnet.cs b/sdk/dotnet/Networking/GetSubnet.cs index 14522d02b..deab01e9d 100644 --- a/sdk/dotnet/Networking/GetSubnet.cs +++ b/sdk/dotnet/Networking/GetSubnet.cs @@ -75,9 +75,6 @@ public sealed class GetSubnetArgs : global::Pulumi.InvokeArgs [Input("description")] public string? Description { get; set; } - [Input("dhcpDisabled")] - public bool? DhcpDisabled { get; set; } - /// /// If the subnet has DHCP enabled. /// @@ -180,9 +177,6 @@ public sealed class GetSubnetInvokeArgs : global::Pulumi.InvokeArgs [Input("description")] public Input? Description { get; set; } - [Input("dhcpDisabled")] - public Input? DhcpDisabled { get; set; } - /// /// If the subnet has DHCP enabled. /// @@ -285,7 +279,6 @@ public sealed class GetSubnetResult public readonly ImmutableArray AllocationPools; public readonly string Cidr; public readonly string Description; - public readonly bool? DhcpDisabled; public readonly bool? DhcpEnabled; /// /// DNS Nameservers of the subnet. @@ -332,8 +325,6 @@ private GetSubnetResult( string description, - bool? dhcpDisabled, - bool? dhcpEnabled, ImmutableArray dnsNameservers, @@ -372,7 +363,6 @@ private GetSubnetResult( AllocationPools = allocationPools; Cidr = cidr; Description = description; - DhcpDisabled = dhcpDisabled; DhcpEnabled = dhcpEnabled; DnsNameservers = dnsNameservers; EnableDhcp = enableDhcp; diff --git a/sdk/dotnet/Networking/Inputs/SubnetAllocationPoolsCollectionArgs.cs b/sdk/dotnet/Networking/Inputs/SubnetAllocationPoolsCollectionArgs.cs deleted file mode 100644 index f1fb5c79f..000000000 --- a/sdk/dotnet/Networking/Inputs/SubnetAllocationPoolsCollectionArgs.cs +++ /dev/null @@ -1,32 +0,0 @@ -// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** -// *** Do not edit by hand unless you're certain you know what you are doing! *** - -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Threading.Tasks; -using Pulumi.Serialization; - -namespace Pulumi.OpenStack.Networking.Inputs -{ - - public sealed class SubnetAllocationPoolsCollectionArgs : global::Pulumi.ResourceArgs - { - /// - /// The ending address. - /// - [Input("end", required: true)] - public Input End { get; set; } = null!; - - /// - /// The starting address. - /// - [Input("start", required: true)] - public Input Start { get; set; } = null!; - - public SubnetAllocationPoolsCollectionArgs() - { - } - public static new SubnetAllocationPoolsCollectionArgs Empty => new SubnetAllocationPoolsCollectionArgs(); - } -} diff --git a/sdk/dotnet/Networking/Inputs/SubnetAllocationPoolsCollectionGetArgs.cs b/sdk/dotnet/Networking/Inputs/SubnetAllocationPoolsCollectionGetArgs.cs deleted file mode 100644 index faaccb74a..000000000 --- a/sdk/dotnet/Networking/Inputs/SubnetAllocationPoolsCollectionGetArgs.cs +++ /dev/null @@ -1,32 +0,0 @@ -// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** -// *** Do not edit by hand unless you're certain you know what you are doing! *** - -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Threading.Tasks; -using Pulumi.Serialization; - -namespace Pulumi.OpenStack.Networking.Inputs -{ - - public sealed class SubnetAllocationPoolsCollectionGetArgs : global::Pulumi.ResourceArgs - { - /// - /// The ending address. - /// - [Input("end", required: true)] - public Input End { get; set; } = null!; - - /// - /// The starting address. - /// - [Input("start", required: true)] - public Input Start { get; set; } = null!; - - public SubnetAllocationPoolsCollectionGetArgs() - { - } - public static new SubnetAllocationPoolsCollectionGetArgs Empty => new SubnetAllocationPoolsCollectionGetArgs(); - } -} diff --git a/sdk/dotnet/Networking/Inputs/SubnetHostRouteArgs.cs b/sdk/dotnet/Networking/Inputs/SubnetHostRouteArgs.cs deleted file mode 100644 index d5181aa2b..000000000 --- a/sdk/dotnet/Networking/Inputs/SubnetHostRouteArgs.cs +++ /dev/null @@ -1,32 +0,0 @@ -// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** -// *** Do not edit by hand unless you're certain you know what you are doing! *** - -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Threading.Tasks; -using Pulumi.Serialization; - -namespace Pulumi.OpenStack.Networking.Inputs -{ - - public sealed class SubnetHostRouteArgs : global::Pulumi.ResourceArgs - { - /// - /// The destination CIDR. - /// - [Input("destinationCidr", required: true)] - public Input DestinationCidr { get; set; } = null!; - - /// - /// The next hop in the route. - /// - [Input("nextHop", required: true)] - public Input NextHop { get; set; } = null!; - - public SubnetHostRouteArgs() - { - } - public static new SubnetHostRouteArgs Empty => new SubnetHostRouteArgs(); - } -} diff --git a/sdk/dotnet/Networking/Inputs/SubnetHostRouteGetArgs.cs b/sdk/dotnet/Networking/Inputs/SubnetHostRouteGetArgs.cs deleted file mode 100644 index 3b79e91e3..000000000 --- a/sdk/dotnet/Networking/Inputs/SubnetHostRouteGetArgs.cs +++ /dev/null @@ -1,32 +0,0 @@ -// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** -// *** Do not edit by hand unless you're certain you know what you are doing! *** - -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Threading.Tasks; -using Pulumi.Serialization; - -namespace Pulumi.OpenStack.Networking.Inputs -{ - - public sealed class SubnetHostRouteGetArgs : global::Pulumi.ResourceArgs - { - /// - /// The destination CIDR. - /// - [Input("destinationCidr", required: true)] - public Input DestinationCidr { get; set; } = null!; - - /// - /// The next hop in the route. - /// - [Input("nextHop", required: true)] - public Input NextHop { get; set; } = null!; - - public SubnetHostRouteGetArgs() - { - } - public static new SubnetHostRouteGetArgs Empty => new SubnetHostRouteGetArgs(); - } -} diff --git a/sdk/dotnet/Networking/Outputs/SubnetAllocationPoolsCollection.cs b/sdk/dotnet/Networking/Outputs/SubnetAllocationPoolsCollection.cs deleted file mode 100644 index 72b1a900b..000000000 --- a/sdk/dotnet/Networking/Outputs/SubnetAllocationPoolsCollection.cs +++ /dev/null @@ -1,35 +0,0 @@ -// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** -// *** Do not edit by hand unless you're certain you know what you are doing! *** - -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Threading.Tasks; -using Pulumi.Serialization; - -namespace Pulumi.OpenStack.Networking.Outputs -{ - - [OutputType] - public sealed class SubnetAllocationPoolsCollection - { - /// - /// The ending address. - /// - public readonly string End; - /// - /// The starting address. - /// - public readonly string Start; - - [OutputConstructor] - private SubnetAllocationPoolsCollection( - string end, - - string start) - { - End = end; - Start = start; - } - } -} diff --git a/sdk/dotnet/Networking/Outputs/SubnetHostRoute.cs b/sdk/dotnet/Networking/Outputs/SubnetHostRoute.cs deleted file mode 100644 index b92d22d0e..000000000 --- a/sdk/dotnet/Networking/Outputs/SubnetHostRoute.cs +++ /dev/null @@ -1,35 +0,0 @@ -// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** -// *** Do not edit by hand unless you're certain you know what you are doing! *** - -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Threading.Tasks; -using Pulumi.Serialization; - -namespace Pulumi.OpenStack.Networking.Outputs -{ - - [OutputType] - public sealed class SubnetHostRoute - { - /// - /// The destination CIDR. - /// - public readonly string DestinationCidr; - /// - /// The next hop in the route. - /// - public readonly string NextHop; - - [OutputConstructor] - private SubnetHostRoute( - string destinationCidr, - - string nextHop) - { - DestinationCidr = destinationCidr; - NextHop = nextHop; - } - } -} diff --git a/sdk/dotnet/Networking/Router.cs b/sdk/dotnet/Networking/Router.cs index 22ddc20c5..509fadac1 100644 --- a/sdk/dotnet/Networking/Router.cs +++ b/sdk/dotnet/Networking/Router.cs @@ -100,16 +100,6 @@ public partial class Router : global::Pulumi.CustomResource [Output("externalFixedIps")] public Output> ExternalFixedIps { get; private set; } = null!; - /// - /// The - /// network UUID of an external gateway for the router. A router with an - /// external gateway is required if any compute instances or load balancers - /// will be using floating IPs. Changing this updates the external gateway - /// of an existing router. - /// - [Output("externalGateway")] - public Output ExternalGateway { get; private set; } = null!; - /// /// The network UUID of an external gateway /// for the router. A router with an external gateway is required if any @@ -279,16 +269,6 @@ public InputList ExternalFixedIps set => _externalFixedIps = value; } - /// - /// The - /// network UUID of an external gateway for the router. A router with an - /// external gateway is required if any compute instances or load balancers - /// will be using floating IPs. Changing this updates the external gateway - /// of an existing router. - /// - [Input("externalGateway")] - public Input? ExternalGateway { get; set; } - /// /// The network UUID of an external gateway /// for the router. A router with an external gateway is required if any @@ -451,16 +431,6 @@ public InputList ExternalFixedIps set => _externalFixedIps = value; } - /// - /// The - /// network UUID of an external gateway for the router. A router with an - /// external gateway is required if any compute instances or load balancers - /// will be using floating IPs. Changing this updates the external gateway - /// of an existing router. - /// - [Input("externalGateway")] - public Input? ExternalGateway { get; set; } - /// /// The network UUID of an external gateway /// for the router. A router with an external gateway is required if any diff --git a/sdk/dotnet/Networking/Subnet.cs b/sdk/dotnet/Networking/Subnet.cs index a30dcf7a7..0a8ad5101 100644 --- a/sdk/dotnet/Networking/Subnet.cs +++ b/sdk/dotnet/Networking/Subnet.cs @@ -66,14 +66,6 @@ public partial class Subnet : global::Pulumi.CustomResource [Output("allocationPools")] public Output> AllocationPools { get; private set; } = null!; - /// - /// A block declaring the start and end range of the IP addresses available for - /// use with DHCP in this subnet. - /// The `allocation_pools` block is documented below. - /// - [Output("allocationPoolsCollection")] - public Output> AllocationPoolsCollection { get; private set; } = null!; - /// /// CIDR representing IP range for this subnet, based on IP /// version. You can omit this option if you are creating a subnet from a @@ -114,16 +106,6 @@ public partial class Subnet : global::Pulumi.CustomResource [Output("gatewayIp")] public Output GatewayIp { get; private set; } = null!; - /// - /// (**Deprecated** - use `openstack.networking.SubnetRoute` - /// instead) An array of routes that should be used by devices - /// with IPs from this subnet (not including local subnet route). The host_route - /// object structure is documented below. Changing this updates the host routes - /// for the existing subnet. - /// - [Output("hostRoutes")] - public Output> HostRoutes { get; private set; } = null!; - /// /// IP version, either 4 (default) or 6. Changing this creates a /// new subnet. @@ -279,21 +261,6 @@ public InputList AllocationPools set => _allocationPools = value; } - [Input("allocationPoolsCollection")] - private InputList? _allocationPoolsCollection; - - /// - /// A block declaring the start and end range of the IP addresses available for - /// use with DHCP in this subnet. - /// The `allocation_pools` block is documented below. - /// - [Obsolete(@"use allocation_pool instead")] - public InputList AllocationPoolsCollection - { - get => _allocationPoolsCollection ?? (_allocationPoolsCollection = new InputList()); - set => _allocationPoolsCollection = value; - } - /// /// CIDR representing IP range for this subnet, based on IP /// version. You can omit this option if you are creating a subnet from a @@ -340,23 +307,6 @@ public InputList DnsNameservers [Input("gatewayIp")] public Input? GatewayIp { get; set; } - [Input("hostRoutes")] - private InputList? _hostRoutes; - - /// - /// (**Deprecated** - use `openstack.networking.SubnetRoute` - /// instead) An array of routes that should be used by devices - /// with IPs from this subnet (not including local subnet route). The host_route - /// object structure is documented below. Changing this updates the host routes - /// for the existing subnet. - /// - [Obsolete(@"Use openstack.networking.SubnetRoute instead")] - public InputList HostRoutes - { - get => _hostRoutes ?? (_hostRoutes = new InputList()); - set => _hostRoutes = value; - } - /// /// IP version, either 4 (default) or 6. Changing this creates a /// new subnet. @@ -505,21 +455,6 @@ public InputList AllocationPools set => _allocationPools = value; } - [Input("allocationPoolsCollection")] - private InputList? _allocationPoolsCollection; - - /// - /// A block declaring the start and end range of the IP addresses available for - /// use with DHCP in this subnet. - /// The `allocation_pools` block is documented below. - /// - [Obsolete(@"use allocation_pool instead")] - public InputList AllocationPoolsCollection - { - get => _allocationPoolsCollection ?? (_allocationPoolsCollection = new InputList()); - set => _allocationPoolsCollection = value; - } - /// /// CIDR representing IP range for this subnet, based on IP /// version. You can omit this option if you are creating a subnet from a @@ -566,23 +501,6 @@ public InputList DnsNameservers [Input("gatewayIp")] public Input? GatewayIp { get; set; } - [Input("hostRoutes")] - private InputList? _hostRoutes; - - /// - /// (**Deprecated** - use `openstack.networking.SubnetRoute` - /// instead) An array of routes that should be used by devices - /// with IPs from this subnet (not including local subnet route). The host_route - /// object structure is documented below. Changing this updates the host routes - /// for the existing subnet. - /// - [Obsolete(@"Use openstack.networking.SubnetRoute instead")] - public InputList HostRoutes - { - get => _hostRoutes ?? (_hostRoutes = new InputList()); - set => _hostRoutes = value; - } - /// /// IP version, either 4 (default) or 6. Changing this creates a /// new subnet. diff --git a/sdk/dotnet/Provider.cs b/sdk/dotnet/Provider.cs index a38f55190..4f150a51e 100644 --- a/sdk/dotnet/Provider.cs +++ b/sdk/dotnet/Provider.cs @@ -368,12 +368,6 @@ public Input? Password [Input("token")] public Input? Token { get; set; } - /// - /// If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron). - /// - [Input("useOctavia", json: true)] - public Input? UseOctavia { get; set; } - /// /// The ID of the domain where the user resides (Identity v3). /// @@ -407,7 +401,6 @@ public ProviderArgs() Insecure = Utilities.GetEnvBoolean("OS_INSECURE"); Region = Utilities.GetEnv("OS_REGION_NAME"); Swauth = Utilities.GetEnvBoolean("OS_SWAUTH"); - UseOctavia = Utilities.GetEnvBoolean("OS_USE_OCTAVIA"); } public static new ProviderArgs Empty => new ProviderArgs(); } diff --git a/sdk/dotnet/Pulumi.OpenStack.csproj b/sdk/dotnet/Pulumi.OpenStack.csproj index e262bce7f..fb89cfdbb 100644 --- a/sdk/dotnet/Pulumi.OpenStack.csproj +++ b/sdk/dotnet/Pulumi.OpenStack.csproj @@ -9,7 +9,7 @@ https://pulumi.io https://github.com/pulumi/pulumi-openstack logo.png - 3.0.0-alpha.0+dev + 4.0.0-alpha.0+dev net6.0 enable diff --git a/sdk/dotnet/VPNaaS/IkePolicy.cs b/sdk/dotnet/VPNaaS/IkePolicy.cs index e0ed36d84..0746fc44d 100644 --- a/sdk/dotnet/VPNaaS/IkePolicy.cs +++ b/sdk/dotnet/VPNaaS/IkePolicy.cs @@ -63,7 +63,7 @@ public partial class IkePolicy : global::Pulumi.CustomResource public Output EncryptionAlgorithm { get; private set; } = null!; /// - /// The IKE mode. A valid value is v1 or v2. Default is v1. + /// The IKE version. A valid value is v1 or v2. Default is v1. /// Changing this updates the existing policy. /// [Output("ikeVersion")] @@ -186,7 +186,7 @@ public sealed class IkePolicyArgs : global::Pulumi.ResourceArgs public Input? EncryptionAlgorithm { get; set; } /// - /// The IKE mode. A valid value is v1 or v2. Default is v1. + /// The IKE version. A valid value is v1 or v2. Default is v1. /// Changing this updates the existing policy. /// [Input("ikeVersion")] @@ -283,7 +283,7 @@ public sealed class IkePolicyState : global::Pulumi.ResourceArgs public Input? EncryptionAlgorithm { get; set; } /// - /// The IKE mode. A valid value is v1 or v2. Default is v1. + /// The IKE version. A valid value is v1 or v2. Default is v1. /// Changing this updates the existing policy. /// [Input("ikeVersion")] diff --git a/sdk/dotnet/pulumi-plugin.json b/sdk/dotnet/pulumi-plugin.json index c2fd7376d..84f878f23 100644 --- a/sdk/dotnet/pulumi-plugin.json +++ b/sdk/dotnet/pulumi-plugin.json @@ -1,5 +1,5 @@ { "resource": true, "name": "openstack", - "version": "3.0.0-alpha.0+dev" + "version": "4.0.0-alpha.0+dev" } diff --git a/sdk/go.mod b/sdk/go.mod index 34f3d7ec3..d79a0a2b7 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -1,4 +1,4 @@ -module github.com/pulumi/pulumi-openstack/sdk/v3 +module github.com/pulumi/pulumi-openstack/sdk/v4 go 1.21 diff --git a/sdk/go/openstack/blockstorage/getAvailabilityZonesV3.go b/sdk/go/openstack/blockstorage/getAvailabilityZonesV3.go index 1a31dcba9..fbb784dd9 100644 --- a/sdk/go/openstack/blockstorage/getAvailabilityZonesV3.go +++ b/sdk/go/openstack/blockstorage/getAvailabilityZonesV3.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/blockstorage/getQuotasetV3.go b/sdk/go/openstack/blockstorage/getQuotasetV3.go index 5c74baedf..f08c9d570 100644 --- a/sdk/go/openstack/blockstorage/getQuotasetV3.go +++ b/sdk/go/openstack/blockstorage/getQuotasetV3.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/blockstorage/getSnapshotV2.go b/sdk/go/openstack/blockstorage/getSnapshotV2.go index f0bec862e..90826adcb 100644 --- a/sdk/go/openstack/blockstorage/getSnapshotV2.go +++ b/sdk/go/openstack/blockstorage/getSnapshotV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/blockstorage/getSnapshotV3.go b/sdk/go/openstack/blockstorage/getSnapshotV3.go index 2e54c0413..583cf24c8 100644 --- a/sdk/go/openstack/blockstorage/getSnapshotV3.go +++ b/sdk/go/openstack/blockstorage/getSnapshotV3.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/blockstorage/getVolumeV2.go b/sdk/go/openstack/blockstorage/getVolumeV2.go index b19182aec..827b4cd9d 100644 --- a/sdk/go/openstack/blockstorage/getVolumeV2.go +++ b/sdk/go/openstack/blockstorage/getVolumeV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/blockstorage/getVolumeV3.go b/sdk/go/openstack/blockstorage/getVolumeV3.go index 1cfecaf97..23010f0f6 100644 --- a/sdk/go/openstack/blockstorage/getVolumeV3.go +++ b/sdk/go/openstack/blockstorage/getVolumeV3.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -81,8 +81,6 @@ type GetVolumeV3Result struct { Id string `pulumi:"id"` // See Argument Reference above. Metadata map[string]interface{} `pulumi:"metadata"` - // Indicates if the volume can be attached to more then one server. - Multiattach bool `pulumi:"multiattach"` // See Argument Reference above. Name string `pulumi:"name"` // See Argument Reference above. @@ -175,11 +173,6 @@ func (o GetVolumeV3ResultOutput) Metadata() pulumi.MapOutput { return o.ApplyT(func(v GetVolumeV3Result) map[string]interface{} { return v.Metadata }).(pulumi.MapOutput) } -// Indicates if the volume can be attached to more then one server. -func (o GetVolumeV3ResultOutput) Multiattach() pulumi.BoolOutput { - return o.ApplyT(func(v GetVolumeV3Result) bool { return v.Multiattach }).(pulumi.BoolOutput) -} - // See Argument Reference above. func (o GetVolumeV3ResultOutput) Name() pulumi.StringOutput { return o.ApplyT(func(v GetVolumeV3Result) string { return v.Name }).(pulumi.StringOutput) diff --git a/sdk/go/openstack/blockstorage/init.go b/sdk/go/openstack/blockstorage/init.go index 71fe08860..11c27e451 100644 --- a/sdk/go/openstack/blockstorage/init.go +++ b/sdk/go/openstack/blockstorage/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/blockstorage/pulumiTypes.go b/sdk/go/openstack/blockstorage/pulumiTypes.go index 7466cec43..faba4b674 100644 --- a/sdk/go/openstack/blockstorage/pulumiTypes.go +++ b/sdk/go/openstack/blockstorage/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/blockstorage/qosAssociationV3.go b/sdk/go/openstack/blockstorage/qosAssociationV3.go index 4a0fbb776..502358b57 100644 --- a/sdk/go/openstack/blockstorage/qosAssociationV3.go +++ b/sdk/go/openstack/blockstorage/qosAssociationV3.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/blockstorage/qosV3.go b/sdk/go/openstack/blockstorage/qosV3.go index 07cb269d6..0abd987f5 100644 --- a/sdk/go/openstack/blockstorage/qosV3.go +++ b/sdk/go/openstack/blockstorage/qosV3.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/blockstorage/quoteSetV2.go b/sdk/go/openstack/blockstorage/quoteSetV2.go index e282ad6a3..0f8eb38e7 100644 --- a/sdk/go/openstack/blockstorage/quoteSetV2.go +++ b/sdk/go/openstack/blockstorage/quoteSetV2.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/blockstorage/quoteSetV3.go b/sdk/go/openstack/blockstorage/quoteSetV3.go index 462799045..6c0d4c0dd 100644 --- a/sdk/go/openstack/blockstorage/quoteSetV3.go +++ b/sdk/go/openstack/blockstorage/quoteSetV3.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/blockstorage/volume.go b/sdk/go/openstack/blockstorage/volume.go index de6bb69f3..b382fb498 100644 --- a/sdk/go/openstack/blockstorage/volume.go +++ b/sdk/go/openstack/blockstorage/volume.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -81,10 +81,6 @@ type Volume struct { // Metadata key/value pairs to associate with the volume. // Changing this updates the existing volume metadata. Metadata pulumi.MapOutput `pulumi:"metadata"` - // (Optional) Allow the volume to be attached to more than one Compute instance. - // - // Deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - Multiattach pulumi.BoolPtrOutput `pulumi:"multiattach"` // A unique name for the volume. Changing this updates the // volume's name. Name pulumi.StringOutput `pulumi:"name"` @@ -173,10 +169,6 @@ type volumeState struct { // Metadata key/value pairs to associate with the volume. // Changing this updates the existing volume metadata. Metadata map[string]interface{} `pulumi:"metadata"` - // (Optional) Allow the volume to be attached to more than one Compute instance. - // - // Deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - Multiattach *bool `pulumi:"multiattach"` // A unique name for the volume. Changing this updates the // volume's name. Name *string `pulumi:"name"` @@ -233,10 +225,6 @@ type VolumeState struct { // Metadata key/value pairs to associate with the volume. // Changing this updates the existing volume metadata. Metadata pulumi.MapInput - // (Optional) Allow the volume to be attached to more than one Compute instance. - // - // Deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - Multiattach pulumi.BoolPtrInput // A unique name for the volume. Changing this updates the // volume's name. Name pulumi.StringPtrInput @@ -293,10 +281,6 @@ type volumeArgs struct { // Metadata key/value pairs to associate with the volume. // Changing this updates the existing volume metadata. Metadata map[string]interface{} `pulumi:"metadata"` - // (Optional) Allow the volume to be attached to more than one Compute instance. - // - // Deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - Multiattach *bool `pulumi:"multiattach"` // A unique name for the volume. Changing this updates the // volume's name. Name *string `pulumi:"name"` @@ -350,10 +334,6 @@ type VolumeArgs struct { // Metadata key/value pairs to associate with the volume. // Changing this updates the existing volume metadata. Metadata pulumi.MapInput - // (Optional) Allow the volume to be attached to more than one Compute instance. - // - // Deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - Multiattach pulumi.BoolPtrInput // A unique name for the volume. Changing this updates the // volume's name. Name pulumi.StringPtrInput @@ -520,13 +500,6 @@ func (o VolumeOutput) Metadata() pulumi.MapOutput { return o.ApplyT(func(v *Volume) pulumi.MapOutput { return v.Metadata }).(pulumi.MapOutput) } -// (Optional) Allow the volume to be attached to more than one Compute instance. -// -// Deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types -func (o VolumeOutput) Multiattach() pulumi.BoolPtrOutput { - return o.ApplyT(func(v *Volume) pulumi.BoolPtrOutput { return v.Multiattach }).(pulumi.BoolPtrOutput) -} - // A unique name for the volume. Changing this updates the // volume's name. func (o VolumeOutput) Name() pulumi.StringOutput { diff --git a/sdk/go/openstack/blockstorage/volumeAttach.go b/sdk/go/openstack/blockstorage/volumeAttach.go index 42b5d44d7..34582bbb4 100644 --- a/sdk/go/openstack/blockstorage/volumeAttach.go +++ b/sdk/go/openstack/blockstorage/volumeAttach.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -36,7 +36,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/blockstorage/volumeAttachV2.go b/sdk/go/openstack/blockstorage/volumeAttachV2.go index af8de3b5b..04c7e3e22 100644 --- a/sdk/go/openstack/blockstorage/volumeAttachV2.go +++ b/sdk/go/openstack/blockstorage/volumeAttachV2.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -36,7 +36,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -109,8 +109,6 @@ type VolumeAttachV2 struct { HostName pulumi.StringOutput `pulumi:"hostName"` // The iSCSI initiator string to make the connection. Initiator pulumi.StringPtrOutput `pulumi:"initiator"` - // Deprecated: instance_id is no longer used in this resource - InstanceId pulumi.StringPtrOutput `pulumi:"instanceId"` // The IP address of the `hostName` above. IpAddress pulumi.StringPtrOutput `pulumi:"ipAddress"` // A mount point base name for shared storage. @@ -193,8 +191,6 @@ type volumeAttachV2State struct { HostName *string `pulumi:"hostName"` // The iSCSI initiator string to make the connection. Initiator *string `pulumi:"initiator"` - // Deprecated: instance_id is no longer used in this resource - InstanceId *string `pulumi:"instanceId"` // The IP address of the `hostName` above. IpAddress *string `pulumi:"ipAddress"` // A mount point base name for shared storage. @@ -238,8 +234,6 @@ type VolumeAttachV2State struct { HostName pulumi.StringPtrInput // The iSCSI initiator string to make the connection. Initiator pulumi.StringPtrInput - // Deprecated: instance_id is no longer used in this resource - InstanceId pulumi.StringPtrInput // The IP address of the `hostName` above. IpAddress pulumi.StringPtrInput // A mount point base name for shared storage. @@ -281,8 +275,6 @@ type volumeAttachV2Args struct { HostName string `pulumi:"hostName"` // The iSCSI initiator string to make the connection. Initiator *string `pulumi:"initiator"` - // Deprecated: instance_id is no longer used in this resource - InstanceId *string `pulumi:"instanceId"` // The IP address of the `hostName` above. IpAddress *string `pulumi:"ipAddress"` // Whether to connect to this volume via multipath. @@ -319,8 +311,6 @@ type VolumeAttachV2Args struct { HostName pulumi.StringInput // The iSCSI initiator string to make the connection. Initiator pulumi.StringPtrInput - // Deprecated: instance_id is no longer used in this resource - InstanceId pulumi.StringPtrInput // The IP address of the `hostName` above. IpAddress pulumi.StringPtrInput // Whether to connect to this volume via multipath. @@ -466,11 +456,6 @@ func (o VolumeAttachV2Output) Initiator() pulumi.StringPtrOutput { return o.ApplyT(func(v *VolumeAttachV2) pulumi.StringPtrOutput { return v.Initiator }).(pulumi.StringPtrOutput) } -// Deprecated: instance_id is no longer used in this resource -func (o VolumeAttachV2Output) InstanceId() pulumi.StringPtrOutput { - return o.ApplyT(func(v *VolumeAttachV2) pulumi.StringPtrOutput { return v.InstanceId }).(pulumi.StringPtrOutput) -} - // The IP address of the `hostName` above. func (o VolumeAttachV2Output) IpAddress() pulumi.StringPtrOutput { return o.ApplyT(func(v *VolumeAttachV2) pulumi.StringPtrOutput { return v.IpAddress }).(pulumi.StringPtrOutput) diff --git a/sdk/go/openstack/blockstorage/volumeTypeAccessV3.go b/sdk/go/openstack/blockstorage/volumeTypeAccessV3.go index c432ca876..62142af8f 100644 --- a/sdk/go/openstack/blockstorage/volumeTypeAccessV3.go +++ b/sdk/go/openstack/blockstorage/volumeTypeAccessV3.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,8 +23,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/blockstorage/volumeTypeV3.go b/sdk/go/openstack/blockstorage/volumeTypeV3.go index ac6c60385..34ebb1eb1 100644 --- a/sdk/go/openstack/blockstorage/volumeTypeV3.go +++ b/sdk/go/openstack/blockstorage/volumeTypeV3.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -17,12 +17,14 @@ import ( // // ## Example Usage // +// ### Basic Volume Type +// // ```go // package main // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -46,6 +48,36 @@ import ( // // ``` // +// ### Volume Type with multiattach enabled +// +// ```go +// package main +// +// import ( +// +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" +// "github.com/pulumi/pulumi/sdk/v3/go/pulumi" +// +// ) +// +// func main() { +// pulumi.Run(func(ctx *pulumi.Context) error { +// _, err := blockstorage.NewVolumeTypeV3(ctx, "multiattach", &blockstorage.VolumeTypeV3Args{ +// Name: pulumi.String("multiattach"), +// Description: pulumi.String("Multiattach-enabled volume type"), +// ExtraSpecs: pulumi.Map{ +// "multiattach": pulumi.Any(" True"), +// }, +// }) +// if err != nil { +// return err +// } +// return nil +// }) +// } +// +// ``` +// // ## Import // // Volume types can be imported using the `volume_type_id`, e.g. diff --git a/sdk/go/openstack/blockstorage/volumeV1.go b/sdk/go/openstack/blockstorage/volumeV1.go index ca53b8a93..f09128ce8 100644 --- a/sdk/go/openstack/blockstorage/volumeV1.go +++ b/sdk/go/openstack/blockstorage/volumeV1.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/blockstorage/volumeV2.go b/sdk/go/openstack/blockstorage/volumeV2.go index a0b6c3c9f..ae16c8d84 100644 --- a/sdk/go/openstack/blockstorage/volumeV2.go +++ b/sdk/go/openstack/blockstorage/volumeV2.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/aggregateV2.go b/sdk/go/openstack/compute/aggregateV2.go index 1d1c61dab..da170673b 100644 --- a/sdk/go/openstack/compute/aggregateV2.go +++ b/sdk/go/openstack/compute/aggregateV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -57,7 +57,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/flavor.go b/sdk/go/openstack/compute/flavor.go index 03d6b00e9..1a8a007b8 100644 --- a/sdk/go/openstack/compute/flavor.go +++ b/sdk/go/openstack/compute/flavor.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/flavorAccess.go b/sdk/go/openstack/compute/flavorAccess.go index 484c3a154..5aa7c68f7 100644 --- a/sdk/go/openstack/compute/flavorAccess.go +++ b/sdk/go/openstack/compute/flavorAccess.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -26,8 +26,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/floatingIp.go b/sdk/go/openstack/compute/floatingIp.go index a4987af13..d072582a4 100644 --- a/sdk/go/openstack/compute/floatingIp.go +++ b/sdk/go/openstack/compute/floatingIp.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -27,7 +27,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/floatingIpAssociate.go b/sdk/go/openstack/compute/floatingIpAssociate.go index 199b6d259..33c4a7ee8 100644 --- a/sdk/go/openstack/compute/floatingIpAssociate.go +++ b/sdk/go/openstack/compute/floatingIpAssociate.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,8 +23,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -69,8 +69,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/getAggregateV2.go b/sdk/go/openstack/compute/getAggregateV2.go index d09b7edd3..2409da757 100644 --- a/sdk/go/openstack/compute/getAggregateV2.go +++ b/sdk/go/openstack/compute/getAggregateV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/getAvailabilityZones.go b/sdk/go/openstack/compute/getAvailabilityZones.go index 46c00d099..38d3e6d68 100644 --- a/sdk/go/openstack/compute/getAvailabilityZones.go +++ b/sdk/go/openstack/compute/getAvailabilityZones.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/getFlavor.go b/sdk/go/openstack/compute/getFlavor.go index 2411255db..91f9241a8 100644 --- a/sdk/go/openstack/compute/getFlavor.go +++ b/sdk/go/openstack/compute/getFlavor.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/getHypervisorV2.go b/sdk/go/openstack/compute/getHypervisorV2.go index 60c27d1e9..0c6d4e505 100644 --- a/sdk/go/openstack/compute/getHypervisorV2.go +++ b/sdk/go/openstack/compute/getHypervisorV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/getInstanceV2.go b/sdk/go/openstack/compute/getInstanceV2.go index f5afad8df..cff23095c 100644 --- a/sdk/go/openstack/compute/getInstanceV2.go +++ b/sdk/go/openstack/compute/getInstanceV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/getKeypair.go b/sdk/go/openstack/compute/getKeypair.go index 3c97e23c8..d496d1c8e 100644 --- a/sdk/go/openstack/compute/getKeypair.go +++ b/sdk/go/openstack/compute/getKeypair.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/getLimitsV2.go b/sdk/go/openstack/compute/getLimitsV2.go index db34f3362..eb9357933 100644 --- a/sdk/go/openstack/compute/getLimitsV2.go +++ b/sdk/go/openstack/compute/getLimitsV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/getQuotaSetV2.go b/sdk/go/openstack/compute/getQuotaSetV2.go index d2734d254..327837790 100644 --- a/sdk/go/openstack/compute/getQuotaSetV2.go +++ b/sdk/go/openstack/compute/getQuotaSetV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/init.go b/sdk/go/openstack/compute/init.go index 6e650d639..bc1846883 100644 --- a/sdk/go/openstack/compute/init.go +++ b/sdk/go/openstack/compute/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/compute/instance.go b/sdk/go/openstack/compute/instance.go index a494c258e..b94aaddd0 100644 --- a/sdk/go/openstack/compute/instance.go +++ b/sdk/go/openstack/compute/instance.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -54,8 +54,6 @@ type Instance struct { // The name of the // desired flavor for the server. Changing this resizes the existing server. FlavorName pulumi.StringOutput `pulumi:"flavorName"` - // Deprecated: Use the compute.FloatingIpAssociate resource instead - FloatingIp pulumi.StringPtrOutput `pulumi:"floatingIp"` // Whether to force the OpenStack instance to be // forcefully deleted. This is useful for environments that have reclaim / soft // deletion enabled. @@ -125,8 +123,6 @@ type Instance struct { // Map of additional vendor-specific options. // Supported options are described below. VendorOptions InstanceVendorOptionsPtrOutput `pulumi:"vendorOptions"` - // Deprecated: Use blockDevice or compute.VolumeAttach instead - Volumes InstanceVolumeArrayOutput `pulumi:"volumes"` } // NewInstance registers a new resource with the given unique name, arguments, and options. @@ -206,8 +202,6 @@ type instanceState struct { // The name of the // desired flavor for the server. Changing this resizes the existing server. FlavorName *string `pulumi:"flavorName"` - // Deprecated: Use the compute.FloatingIpAssociate resource instead - FloatingIp *string `pulumi:"floatingIp"` // Whether to force the OpenStack instance to be // forcefully deleted. This is useful for environments that have reclaim / soft // deletion enabled. @@ -277,8 +271,6 @@ type instanceState struct { // Map of additional vendor-specific options. // Supported options are described below. VendorOptions *InstanceVendorOptions `pulumi:"vendorOptions"` - // Deprecated: Use blockDevice or compute.VolumeAttach instead - Volumes []InstanceVolume `pulumi:"volumes"` } type InstanceState struct { @@ -322,8 +314,6 @@ type InstanceState struct { // The name of the // desired flavor for the server. Changing this resizes the existing server. FlavorName pulumi.StringPtrInput - // Deprecated: Use the compute.FloatingIpAssociate resource instead - FloatingIp pulumi.StringPtrInput // Whether to force the OpenStack instance to be // forcefully deleted. This is useful for environments that have reclaim / soft // deletion enabled. @@ -393,8 +383,6 @@ type InstanceState struct { // Map of additional vendor-specific options. // Supported options are described below. VendorOptions InstanceVendorOptionsPtrInput - // Deprecated: Use blockDevice or compute.VolumeAttach instead - Volumes InstanceVolumeArrayInput } func (InstanceState) ElementType() reflect.Type { @@ -436,8 +424,6 @@ type instanceArgs struct { // The name of the // desired flavor for the server. Changing this resizes the existing server. FlavorName *string `pulumi:"flavorName"` - // Deprecated: Use the compute.FloatingIpAssociate resource instead - FloatingIp *string `pulumi:"floatingIp"` // Whether to force the OpenStack instance to be // forcefully deleted. This is useful for environments that have reclaim / soft // deletion enabled. @@ -505,8 +491,6 @@ type instanceArgs struct { // Map of additional vendor-specific options. // Supported options are described below. VendorOptions *InstanceVendorOptions `pulumi:"vendorOptions"` - // Deprecated: Use blockDevice or compute.VolumeAttach instead - Volumes []InstanceVolume `pulumi:"volumes"` } // The set of arguments for constructing a Instance resource. @@ -545,8 +529,6 @@ type InstanceArgs struct { // The name of the // desired flavor for the server. Changing this resizes the existing server. FlavorName pulumi.StringPtrInput - // Deprecated: Use the compute.FloatingIpAssociate resource instead - FloatingIp pulumi.StringPtrInput // Whether to force the OpenStack instance to be // forcefully deleted. This is useful for environments that have reclaim / soft // deletion enabled. @@ -614,8 +596,6 @@ type InstanceArgs struct { // Map of additional vendor-specific options. // Supported options are described below. VendorOptions InstanceVendorOptionsPtrInput - // Deprecated: Use blockDevice or compute.VolumeAttach instead - Volumes InstanceVolumeArrayInput } func (InstanceArgs) ElementType() reflect.Type { @@ -781,11 +761,6 @@ func (o InstanceOutput) FlavorName() pulumi.StringOutput { return o.ApplyT(func(v *Instance) pulumi.StringOutput { return v.FlavorName }).(pulumi.StringOutput) } -// Deprecated: Use the compute.FloatingIpAssociate resource instead -func (o InstanceOutput) FloatingIp() pulumi.StringPtrOutput { - return o.ApplyT(func(v *Instance) pulumi.StringPtrOutput { return v.FloatingIp }).(pulumi.StringPtrOutput) -} - // Whether to force the OpenStack instance to be // forcefully deleted. This is useful for environments that have reclaim / soft // deletion enabled. @@ -909,11 +884,6 @@ func (o InstanceOutput) VendorOptions() InstanceVendorOptionsPtrOutput { return o.ApplyT(func(v *Instance) InstanceVendorOptionsPtrOutput { return v.VendorOptions }).(InstanceVendorOptionsPtrOutput) } -// Deprecated: Use blockDevice or compute.VolumeAttach instead -func (o InstanceOutput) Volumes() InstanceVolumeArrayOutput { - return o.ApplyT(func(v *Instance) InstanceVolumeArrayOutput { return v.Volumes }).(InstanceVolumeArrayOutput) -} - type InstanceArrayOutput struct{ *pulumi.OutputState } func (InstanceArrayOutput) ElementType() reflect.Type { diff --git a/sdk/go/openstack/compute/interfaceAttach.go b/sdk/go/openstack/compute/interfaceAttach.go index 1f573ebaf..2877af644 100644 --- a/sdk/go/openstack/compute/interfaceAttach.go +++ b/sdk/go/openstack/compute/interfaceAttach.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -24,8 +24,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -68,8 +68,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -113,8 +113,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/keypair.go b/sdk/go/openstack/compute/keypair.go index 9cb85d533..aac06ee2c 100644 --- a/sdk/go/openstack/compute/keypair.go +++ b/sdk/go/openstack/compute/keypair.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -47,7 +47,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/pulumiTypes.go b/sdk/go/openstack/compute/pulumiTypes.go index 7c441855d..101e78e97 100644 --- a/sdk/go/openstack/compute/pulumiTypes.go +++ b/sdk/go/openstack/compute/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -271,9 +271,7 @@ type InstanceNetwork struct { // network. Changing this creates a new server. FixedIpV4 *string `pulumi:"fixedIpV4"` FixedIpV6 *string `pulumi:"fixedIpV6"` - // Deprecated: Use the compute.FloatingIpAssociate resource instead - FloatingIp *string `pulumi:"floatingIp"` - Mac *string `pulumi:"mac"` + Mac *string `pulumi:"mac"` // The human-readable // name of the network. Changing this creates a new server. Name *string `pulumi:"name"` @@ -304,9 +302,7 @@ type InstanceNetworkArgs struct { // network. Changing this creates a new server. FixedIpV4 pulumi.StringPtrInput `pulumi:"fixedIpV4"` FixedIpV6 pulumi.StringPtrInput `pulumi:"fixedIpV6"` - // Deprecated: Use the compute.FloatingIpAssociate resource instead - FloatingIp pulumi.StringPtrInput `pulumi:"floatingIp"` - Mac pulumi.StringPtrInput `pulumi:"mac"` + Mac pulumi.StringPtrInput `pulumi:"mac"` // The human-readable // name of the network. Changing this creates a new server. Name pulumi.StringPtrInput `pulumi:"name"` @@ -385,11 +381,6 @@ func (o InstanceNetworkOutput) FixedIpV6() pulumi.StringPtrOutput { return o.ApplyT(func(v InstanceNetwork) *string { return v.FixedIpV6 }).(pulumi.StringPtrOutput) } -// Deprecated: Use the compute.FloatingIpAssociate resource instead -func (o InstanceNetworkOutput) FloatingIp() pulumi.StringPtrOutput { - return o.ApplyT(func(v InstanceNetwork) *string { return v.FloatingIp }).(pulumi.StringPtrOutput) -} - func (o InstanceNetworkOutput) Mac() pulumi.StringPtrOutput { return o.ApplyT(func(v InstanceNetwork) *string { return v.Mac }).(pulumi.StringPtrOutput) } @@ -551,7 +542,8 @@ type InstanceSchedulerHint struct { // be scheduled on a different host than all other instances. DifferentHosts []string `pulumi:"differentHosts"` // A UUID of a Server Group. The instance will be placed - // into that group. + // into that group. See reference + // for details on managing servergroup resources Group *string `pulumi:"group"` // A conditional query that a compute node must pass in // order to host an instance. The query must use the `JsonFilter` syntax @@ -591,7 +583,8 @@ type InstanceSchedulerHintArgs struct { // be scheduled on a different host than all other instances. DifferentHosts pulumi.StringArrayInput `pulumi:"differentHosts"` // A UUID of a Server Group. The instance will be placed - // into that group. + // into that group. See reference + // for details on managing servergroup resources Group pulumi.StringPtrInput `pulumi:"group"` // A conditional query that a compute node must pass in // order to host an instance. The query must use the `JsonFilter` syntax @@ -682,7 +675,8 @@ func (o InstanceSchedulerHintOutput) DifferentHosts() pulumi.StringArrayOutput { } // A UUID of a Server Group. The instance will be placed -// into that group. +// into that group. See reference +// for details on managing servergroup resources func (o InstanceSchedulerHintOutput) Group() pulumi.StringPtrOutput { return o.ApplyT(func(v InstanceSchedulerHint) *string { return v.Group }).(pulumi.StringPtrOutput) } @@ -904,112 +898,6 @@ func (o InstanceVendorOptionsPtrOutput) IgnoreResizeConfirmation() pulumi.BoolPt }).(pulumi.BoolPtrOutput) } -type InstanceVolume struct { - Device *string `pulumi:"device"` - Id *string `pulumi:"id"` - VolumeId string `pulumi:"volumeId"` -} - -// InstanceVolumeInput is an input type that accepts InstanceVolumeArgs and InstanceVolumeOutput values. -// You can construct a concrete instance of `InstanceVolumeInput` via: -// -// InstanceVolumeArgs{...} -type InstanceVolumeInput interface { - pulumi.Input - - ToInstanceVolumeOutput() InstanceVolumeOutput - ToInstanceVolumeOutputWithContext(context.Context) InstanceVolumeOutput -} - -type InstanceVolumeArgs struct { - Device pulumi.StringPtrInput `pulumi:"device"` - Id pulumi.StringPtrInput `pulumi:"id"` - VolumeId pulumi.StringInput `pulumi:"volumeId"` -} - -func (InstanceVolumeArgs) ElementType() reflect.Type { - return reflect.TypeOf((*InstanceVolume)(nil)).Elem() -} - -func (i InstanceVolumeArgs) ToInstanceVolumeOutput() InstanceVolumeOutput { - return i.ToInstanceVolumeOutputWithContext(context.Background()) -} - -func (i InstanceVolumeArgs) ToInstanceVolumeOutputWithContext(ctx context.Context) InstanceVolumeOutput { - return pulumi.ToOutputWithContext(ctx, i).(InstanceVolumeOutput) -} - -// InstanceVolumeArrayInput is an input type that accepts InstanceVolumeArray and InstanceVolumeArrayOutput values. -// You can construct a concrete instance of `InstanceVolumeArrayInput` via: -// -// InstanceVolumeArray{ InstanceVolumeArgs{...} } -type InstanceVolumeArrayInput interface { - pulumi.Input - - ToInstanceVolumeArrayOutput() InstanceVolumeArrayOutput - ToInstanceVolumeArrayOutputWithContext(context.Context) InstanceVolumeArrayOutput -} - -type InstanceVolumeArray []InstanceVolumeInput - -func (InstanceVolumeArray) ElementType() reflect.Type { - return reflect.TypeOf((*[]InstanceVolume)(nil)).Elem() -} - -func (i InstanceVolumeArray) ToInstanceVolumeArrayOutput() InstanceVolumeArrayOutput { - return i.ToInstanceVolumeArrayOutputWithContext(context.Background()) -} - -func (i InstanceVolumeArray) ToInstanceVolumeArrayOutputWithContext(ctx context.Context) InstanceVolumeArrayOutput { - return pulumi.ToOutputWithContext(ctx, i).(InstanceVolumeArrayOutput) -} - -type InstanceVolumeOutput struct{ *pulumi.OutputState } - -func (InstanceVolumeOutput) ElementType() reflect.Type { - return reflect.TypeOf((*InstanceVolume)(nil)).Elem() -} - -func (o InstanceVolumeOutput) ToInstanceVolumeOutput() InstanceVolumeOutput { - return o -} - -func (o InstanceVolumeOutput) ToInstanceVolumeOutputWithContext(ctx context.Context) InstanceVolumeOutput { - return o -} - -func (o InstanceVolumeOutput) Device() pulumi.StringPtrOutput { - return o.ApplyT(func(v InstanceVolume) *string { return v.Device }).(pulumi.StringPtrOutput) -} - -func (o InstanceVolumeOutput) Id() pulumi.StringPtrOutput { - return o.ApplyT(func(v InstanceVolume) *string { return v.Id }).(pulumi.StringPtrOutput) -} - -func (o InstanceVolumeOutput) VolumeId() pulumi.StringOutput { - return o.ApplyT(func(v InstanceVolume) string { return v.VolumeId }).(pulumi.StringOutput) -} - -type InstanceVolumeArrayOutput struct{ *pulumi.OutputState } - -func (InstanceVolumeArrayOutput) ElementType() reflect.Type { - return reflect.TypeOf((*[]InstanceVolume)(nil)).Elem() -} - -func (o InstanceVolumeArrayOutput) ToInstanceVolumeArrayOutput() InstanceVolumeArrayOutput { - return o -} - -func (o InstanceVolumeArrayOutput) ToInstanceVolumeArrayOutputWithContext(ctx context.Context) InstanceVolumeArrayOutput { - return o -} - -func (o InstanceVolumeArrayOutput) Index(i pulumi.IntInput) InstanceVolumeOutput { - return pulumi.All(o, i).ApplyT(func(vs []interface{}) InstanceVolume { - return vs[0].([]InstanceVolume)[vs[1].(int)] - }).(InstanceVolumeOutput) -} - type SecGroupRule struct { // Required if `fromGroupId` or `self` is empty. The IP range // that will be the source of network traffic to the security group. Use 0.0.0.0/0 @@ -1619,8 +1507,6 @@ func init() { pulumi.RegisterInputType(reflect.TypeOf((*InstanceSchedulerHintArrayInput)(nil)).Elem(), InstanceSchedulerHintArray{}) pulumi.RegisterInputType(reflect.TypeOf((*InstanceVendorOptionsInput)(nil)).Elem(), InstanceVendorOptionsArgs{}) pulumi.RegisterInputType(reflect.TypeOf((*InstanceVendorOptionsPtrInput)(nil)).Elem(), InstanceVendorOptionsArgs{}) - pulumi.RegisterInputType(reflect.TypeOf((*InstanceVolumeInput)(nil)).Elem(), InstanceVolumeArgs{}) - pulumi.RegisterInputType(reflect.TypeOf((*InstanceVolumeArrayInput)(nil)).Elem(), InstanceVolumeArray{}) pulumi.RegisterInputType(reflect.TypeOf((*SecGroupRuleInput)(nil)).Elem(), SecGroupRuleArgs{}) pulumi.RegisterInputType(reflect.TypeOf((*SecGroupRuleArrayInput)(nil)).Elem(), SecGroupRuleArray{}) pulumi.RegisterInputType(reflect.TypeOf((*ServerGroupRulesInput)(nil)).Elem(), ServerGroupRulesArgs{}) @@ -1639,8 +1525,6 @@ func init() { pulumi.RegisterOutputType(InstanceSchedulerHintArrayOutput{}) pulumi.RegisterOutputType(InstanceVendorOptionsOutput{}) pulumi.RegisterOutputType(InstanceVendorOptionsPtrOutput{}) - pulumi.RegisterOutputType(InstanceVolumeOutput{}) - pulumi.RegisterOutputType(InstanceVolumeArrayOutput{}) pulumi.RegisterOutputType(SecGroupRuleOutput{}) pulumi.RegisterOutputType(SecGroupRuleArrayOutput{}) pulumi.RegisterOutputType(ServerGroupRulesOutput{}) diff --git a/sdk/go/openstack/compute/quotaSetV2.go b/sdk/go/openstack/compute/quotaSetV2.go index b8c00dd41..2b3f08635 100644 --- a/sdk/go/openstack/compute/quotaSetV2.go +++ b/sdk/go/openstack/compute/quotaSetV2.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/compute/secGroup.go b/sdk/go/openstack/compute/secGroup.go index 6bc1bc31a..33ccf6713 100644 --- a/sdk/go/openstack/compute/secGroup.go +++ b/sdk/go/openstack/compute/secGroup.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -27,7 +27,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -72,7 +72,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/compute/serverGroup.go b/sdk/go/openstack/compute/serverGroup.go index d214889e1..5c0222f0f 100644 --- a/sdk/go/openstack/compute/serverGroup.go +++ b/sdk/go/openstack/compute/serverGroup.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -38,6 +38,24 @@ import ( // if err != nil { // return err // } +// _, err = compute.NewInstance(ctx, "test-instance", &compute.InstanceArgs{ +// Name: pulumi.String("my-instance"), +// ImageId: pulumi.String("ad091b52-742f-469e-8f3c-fd81cadf0743"), +// FlavorId: pulumi.String("3"), +// SchedulerHints: compute.InstanceSchedulerHintArray{ +// &compute.InstanceSchedulerHintArgs{ +// Group: test_sg.ID(), +// }, +// }, +// Networks: compute.InstanceNetworkArray{ +// &compute.InstanceNetworkArgs{ +// Name: pulumi.String("my_network"), +// }, +// }, +// }) +// if err != nil { +// return err +// } // return nil // }) // } @@ -51,7 +69,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -70,6 +88,24 @@ import ( // if err != nil { // return err // } +// _, err = compute.NewInstance(ctx, "test-instance", &compute.InstanceArgs{ +// Name: pulumi.String("my-instance"), +// ImageId: pulumi.String("ad091b52-742f-469e-8f3c-fd81cadf0743"), +// FlavorId: pulumi.String("3"), +// SchedulerHints: compute.InstanceSchedulerHintArray{ +// &compute.InstanceSchedulerHintArgs{ +// Group: test_sg.ID(), +// }, +// }, +// Networks: compute.InstanceNetworkArray{ +// &compute.InstanceNetworkArgs{ +// Name: pulumi.String("my_network"), +// }, +// }, +// }) +// if err != nil { +// return err +// } // return nil // }) // } diff --git a/sdk/go/openstack/compute/volumeAttach.go b/sdk/go/openstack/compute/volumeAttach.go index 05eb005f7..3d19d4c80 100644 --- a/sdk/go/openstack/compute/volumeAttach.go +++ b/sdk/go/openstack/compute/volumeAttach.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -24,8 +24,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -64,15 +64,15 @@ import ( // ### Using Multiattach-enabled volumes // // Multiattach Volumes are dependent upon your OpenStack cloud and not all -// clouds support multiattach. +// clouds support multiattach. Multiattach volumes require a volumeType that has [multiattach enabled](https://docs.openstack.org/cinder/latest/admin/volume-multiattach.html#multiattach-volume-type). // // ```go // package main // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/blockstorage" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/blockstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -80,9 +80,9 @@ import ( // func main() { // pulumi.Run(func(ctx *pulumi.Context) error { // volume1, err := blockstorage.NewVolume(ctx, "volume_1", &blockstorage.VolumeArgs{ -// Name: pulumi.String("volume_1"), -// Size: pulumi.Int(1), -// Multiattach: pulumi.Bool(true), +// Name: pulumi.String("volume_1"), +// Size: pulumi.Int(1), +// VolumeType: pulumi.String("multiattach"), // }) // if err != nil { // return err @@ -153,6 +153,10 @@ type VolumeAttach struct { // `region` argument of the provider is used. Changing this creates a // new volume attachment. Region pulumi.StringOutput `pulumi:"region"` + // Add a device role tag that is applied to the volume when + // attaching it to the VM. Changing this creates a new volume attachment with + // the new tag. Requires microversion >= 2.49. + Tag pulumi.StringPtrOutput `pulumi:"tag"` // Map of additional vendor-specific options. // Supported options are described below. VendorOptions VolumeAttachVendorOptionsPtrOutput `pulumi:"vendorOptions"` @@ -206,6 +210,10 @@ type volumeAttachState struct { // `region` argument of the provider is used. Changing this creates a // new volume attachment. Region *string `pulumi:"region"` + // Add a device role tag that is applied to the volume when + // attaching it to the VM. Changing this creates a new volume attachment with + // the new tag. Requires microversion >= 2.49. + Tag *string `pulumi:"tag"` // Map of additional vendor-specific options. // Supported options are described below. VendorOptions *VolumeAttachVendorOptions `pulumi:"vendorOptions"` @@ -224,6 +232,10 @@ type VolumeAttachState struct { // `region` argument of the provider is used. Changing this creates a // new volume attachment. Region pulumi.StringPtrInput + // Add a device role tag that is applied to the volume when + // attaching it to the VM. Changing this creates a new volume attachment with + // the new tag. Requires microversion >= 2.49. + Tag pulumi.StringPtrInput // Map of additional vendor-specific options. // Supported options are described below. VendorOptions VolumeAttachVendorOptionsPtrInput @@ -246,6 +258,10 @@ type volumeAttachArgs struct { // `region` argument of the provider is used. Changing this creates a // new volume attachment. Region *string `pulumi:"region"` + // Add a device role tag that is applied to the volume when + // attaching it to the VM. Changing this creates a new volume attachment with + // the new tag. Requires microversion >= 2.49. + Tag *string `pulumi:"tag"` // Map of additional vendor-specific options. // Supported options are described below. VendorOptions *VolumeAttachVendorOptions `pulumi:"vendorOptions"` @@ -265,6 +281,10 @@ type VolumeAttachArgs struct { // `region` argument of the provider is used. Changing this creates a // new volume attachment. Region pulumi.StringPtrInput + // Add a device role tag that is applied to the volume when + // attaching it to the VM. Changing this creates a new volume attachment with + // the new tag. Requires microversion >= 2.49. + Tag pulumi.StringPtrInput // Map of additional vendor-specific options. // Supported options are described below. VendorOptions VolumeAttachVendorOptionsPtrInput @@ -381,6 +401,13 @@ func (o VolumeAttachOutput) Region() pulumi.StringOutput { return o.ApplyT(func(v *VolumeAttach) pulumi.StringOutput { return v.Region }).(pulumi.StringOutput) } +// Add a device role tag that is applied to the volume when +// attaching it to the VM. Changing this creates a new volume attachment with +// the new tag. Requires microversion >= 2.49. +func (o VolumeAttachOutput) Tag() pulumi.StringPtrOutput { + return o.ApplyT(func(v *VolumeAttach) pulumi.StringPtrOutput { return v.Tag }).(pulumi.StringPtrOutput) +} + // Map of additional vendor-specific options. // Supported options are described below. func (o VolumeAttachOutput) VendorOptions() VolumeAttachVendorOptionsPtrOutput { diff --git a/sdk/go/openstack/config/config.go b/sdk/go/openstack/config/config.go index 7315a58bc..3da65b5f7 100644 --- a/sdk/go/openstack/config/config.go +++ b/sdk/go/openstack/config/config.go @@ -4,7 +4,7 @@ package config import ( - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config" ) @@ -207,21 +207,6 @@ func GetToken(ctx *pulumi.Context) string { return config.Get(ctx, "openstack:token") } -// If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron). -// -// Deprecated: Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. -func GetUseOctavia(ctx *pulumi.Context) bool { - v, err := config.TryBool(ctx, "openstack:useOctavia") - if err == nil { - return v - } - var value bool - if d := internal.GetEnvOrDefault(nil, internal.ParseEnvBool, "OS_USE_OCTAVIA"); d != nil { - value = d.(bool) - } - return value -} - // The ID of the domain where the user resides (Identity v3). func GetUserDomainId(ctx *pulumi.Context) string { return config.Get(ctx, "openstack:userDomainId") diff --git a/sdk/go/openstack/containerinfra/cluster.go b/sdk/go/openstack/containerinfra/cluster.go index 5f3208cd4..7f83407dd 100644 --- a/sdk/go/openstack/containerinfra/cluster.go +++ b/sdk/go/openstack/containerinfra/cluster.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -27,7 +27,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/containerinfra" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/containerinfra" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/containerinfra/clusterTemplate.go b/sdk/go/openstack/containerinfra/clusterTemplate.go index 07cb8f59d..059b1b1a2 100644 --- a/sdk/go/openstack/containerinfra/clusterTemplate.go +++ b/sdk/go/openstack/containerinfra/clusterTemplate.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/containerinfra" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/containerinfra" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/containerinfra/getCluster.go b/sdk/go/openstack/containerinfra/getCluster.go index c610430d2..5b35ceace 100644 --- a/sdk/go/openstack/containerinfra/getCluster.go +++ b/sdk/go/openstack/containerinfra/getCluster.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/containerinfra" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/containerinfra" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/containerinfra/getClusterTemplate.go b/sdk/go/openstack/containerinfra/getClusterTemplate.go index 7327f6085..0af69c3ea 100644 --- a/sdk/go/openstack/containerinfra/getClusterTemplate.go +++ b/sdk/go/openstack/containerinfra/getClusterTemplate.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/containerinfra" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/containerinfra" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/containerinfra/getNodeGroup.go b/sdk/go/openstack/containerinfra/getNodeGroup.go index f7b590d9f..0c2f3796d 100644 --- a/sdk/go/openstack/containerinfra/getNodeGroup.go +++ b/sdk/go/openstack/containerinfra/getNodeGroup.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/containerinfra" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/containerinfra" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/containerinfra/init.go b/sdk/go/openstack/containerinfra/init.go index b1bf27390..ba540aff7 100644 --- a/sdk/go/openstack/containerinfra/init.go +++ b/sdk/go/openstack/containerinfra/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/containerinfra/nodeGroup.go b/sdk/go/openstack/containerinfra/nodeGroup.go index 0f2f3143b..fc6861e59 100644 --- a/sdk/go/openstack/containerinfra/nodeGroup.go +++ b/sdk/go/openstack/containerinfra/nodeGroup.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/containerinfra" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/containerinfra" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/database/configuration.go b/sdk/go/openstack/database/configuration.go index 31c4159f2..47f04c4ca 100644 --- a/sdk/go/openstack/database/configuration.go +++ b/sdk/go/openstack/database/configuration.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/database/database.go b/sdk/go/openstack/database/database.go index 6986db408..bcad11af6 100644 --- a/sdk/go/openstack/database/database.go +++ b/sdk/go/openstack/database/database.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/database" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/database" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/database/init.go b/sdk/go/openstack/database/init.go index bad8bc199..a7fe2bd45 100644 --- a/sdk/go/openstack/database/init.go +++ b/sdk/go/openstack/database/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/database/instance.go b/sdk/go/openstack/database/instance.go index 94f1887ac..9ce6295fb 100644 --- a/sdk/go/openstack/database/instance.go +++ b/sdk/go/openstack/database/instance.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -27,7 +27,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/database" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/database" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/database/pulumiTypes.go b/sdk/go/openstack/database/pulumiTypes.go index 13dc74759..3ed5fdc14 100644 --- a/sdk/go/openstack/database/pulumiTypes.go +++ b/sdk/go/openstack/database/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/database/user.go b/sdk/go/openstack/database/user.go index c0c7930ec..e16053e42 100644 --- a/sdk/go/openstack/database/user.go +++ b/sdk/go/openstack/database/user.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -27,7 +27,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/database" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/database" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/dns/getDnsZone.go b/sdk/go/openstack/dns/getDnsZone.go index a1ea6c482..91649ecd2 100644 --- a/sdk/go/openstack/dns/getDnsZone.go +++ b/sdk/go/openstack/dns/getDnsZone.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/dns" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/dns" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/dns/init.go b/sdk/go/openstack/dns/init.go index c9fa4f1c0..33e0194db 100644 --- a/sdk/go/openstack/dns/init.go +++ b/sdk/go/openstack/dns/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/dns/recordSet.go b/sdk/go/openstack/dns/recordSet.go index 9f963875f..c4e89dfea 100644 --- a/sdk/go/openstack/dns/recordSet.go +++ b/sdk/go/openstack/dns/recordSet.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/dns" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/dns" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/dns/transferAccept.go b/sdk/go/openstack/dns/transferAccept.go index 38e6d8e93..373f6b757 100644 --- a/sdk/go/openstack/dns/transferAccept.go +++ b/sdk/go/openstack/dns/transferAccept.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/dns" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/dns" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/dns/transferRequest.go b/sdk/go/openstack/dns/transferRequest.go index 7fb023cbb..857b4e530 100644 --- a/sdk/go/openstack/dns/transferRequest.go +++ b/sdk/go/openstack/dns/transferRequest.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/dns" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/dns" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/dns/zone.go b/sdk/go/openstack/dns/zone.go index 18dafb8a9..221500a6e 100644 --- a/sdk/go/openstack/dns/zone.go +++ b/sdk/go/openstack/dns/zone.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/dns" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/dns" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/firewall/firewall.go b/sdk/go/openstack/firewall/firewall.go index ec4f50e87..a6a4af907 100644 --- a/sdk/go/openstack/firewall/firewall.go +++ b/sdk/go/openstack/firewall/firewall.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/firewall" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/firewall" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/firewall/getPolicy.go b/sdk/go/openstack/firewall/getPolicy.go index a67e00b88..b2708c3c3 100644 --- a/sdk/go/openstack/firewall/getPolicy.go +++ b/sdk/go/openstack/firewall/getPolicy.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/firewall" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/firewall" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/firewall/groupV2.go b/sdk/go/openstack/firewall/groupV2.go index 23891293c..cc61910e7 100644 --- a/sdk/go/openstack/firewall/groupV2.go +++ b/sdk/go/openstack/firewall/groupV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/firewall" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/firewall" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/firewall/init.go b/sdk/go/openstack/firewall/init.go index eeefb1bd7..0833e9285 100644 --- a/sdk/go/openstack/firewall/init.go +++ b/sdk/go/openstack/firewall/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/firewall/policy.go b/sdk/go/openstack/firewall/policy.go index 57f22d5be..52bb1f29a 100644 --- a/sdk/go/openstack/firewall/policy.go +++ b/sdk/go/openstack/firewall/policy.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/firewall" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/firewall" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/firewall/policyV2.go b/sdk/go/openstack/firewall/policyV2.go index 4ddd97f0a..1df9cd69e 100644 --- a/sdk/go/openstack/firewall/policyV2.go +++ b/sdk/go/openstack/firewall/policyV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/firewall" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/firewall" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/firewall/rule.go b/sdk/go/openstack/firewall/rule.go index bb42f3a98..df87f3758 100644 --- a/sdk/go/openstack/firewall/rule.go +++ b/sdk/go/openstack/firewall/rule.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/firewall" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/firewall" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/firewall/ruleV2.go b/sdk/go/openstack/firewall/ruleV2.go index a21096f3e..9c05df744 100644 --- a/sdk/go/openstack/firewall/ruleV2.go +++ b/sdk/go/openstack/firewall/ruleV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/firewall" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/firewall" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/getFwGroupV2.go b/sdk/go/openstack/getFwGroupV2.go index 0d00ce936..d6936af4b 100644 --- a/sdk/go/openstack/getFwGroupV2.go +++ b/sdk/go/openstack/getFwGroupV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/getFwPolicyV2.go b/sdk/go/openstack/getFwPolicyV2.go index dd924007a..9ec29a372 100644 --- a/sdk/go/openstack/getFwPolicyV2.go +++ b/sdk/go/openstack/getFwPolicyV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/getFwRuleV2.go b/sdk/go/openstack/getFwRuleV2.go index e153fc9db..a3bb02e15 100644 --- a/sdk/go/openstack/getFwRuleV2.go +++ b/sdk/go/openstack/getFwRuleV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/applicationCredential.go b/sdk/go/openstack/identity/applicationCredential.go index 44049f21e..f0923eccd 100644 --- a/sdk/go/openstack/identity/applicationCredential.go +++ b/sdk/go/openstack/identity/applicationCredential.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -33,7 +33,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -71,7 +71,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -103,7 +103,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/ec2CredentialV3.go b/sdk/go/openstack/identity/ec2CredentialV3.go index c26ff2d5c..ab8a45374 100644 --- a/sdk/go/openstack/identity/ec2CredentialV3.go +++ b/sdk/go/openstack/identity/ec2CredentialV3.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -28,7 +28,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -55,7 +55,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/endpointV3.go b/sdk/go/openstack/identity/endpointV3.go index c3c852846..a62036527 100644 --- a/sdk/go/openstack/identity/endpointV3.go +++ b/sdk/go/openstack/identity/endpointV3.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/getAuthScope.go b/sdk/go/openstack/identity/getAuthScope.go index a51dd8f95..c07be6573 100644 --- a/sdk/go/openstack/identity/getAuthScope.go +++ b/sdk/go/openstack/identity/getAuthScope.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/identity/getEndpoint.go b/sdk/go/openstack/identity/getEndpoint.go index 927ea216c..3d0a744ae 100644 --- a/sdk/go/openstack/identity/getEndpoint.go +++ b/sdk/go/openstack/identity/getEndpoint.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/getGroup.go b/sdk/go/openstack/identity/getGroup.go index 7146ead5a..c518eae22 100644 --- a/sdk/go/openstack/identity/getGroup.go +++ b/sdk/go/openstack/identity/getGroup.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/getProject.go b/sdk/go/openstack/identity/getProject.go index bb378dfba..32bae7e5b 100644 --- a/sdk/go/openstack/identity/getProject.go +++ b/sdk/go/openstack/identity/getProject.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/getRole.go b/sdk/go/openstack/identity/getRole.go index 83c07b6d5..f8c49499d 100644 --- a/sdk/go/openstack/identity/getRole.go +++ b/sdk/go/openstack/identity/getRole.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/getService.go b/sdk/go/openstack/identity/getService.go index 26d641598..c897e599f 100644 --- a/sdk/go/openstack/identity/getService.go +++ b/sdk/go/openstack/identity/getService.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/getUser.go b/sdk/go/openstack/identity/getUser.go index e054e9b7a..26de293e2 100644 --- a/sdk/go/openstack/identity/getUser.go +++ b/sdk/go/openstack/identity/getUser.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/groupV3.go b/sdk/go/openstack/identity/groupV3.go index c11b451f5..27e4c83f4 100644 --- a/sdk/go/openstack/identity/groupV3.go +++ b/sdk/go/openstack/identity/groupV3.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/inheritRoleAssignment.go b/sdk/go/openstack/identity/inheritRoleAssignment.go index a0676084b..7125b346a 100644 --- a/sdk/go/openstack/identity/inheritRoleAssignment.go +++ b/sdk/go/openstack/identity/inheritRoleAssignment.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -26,7 +26,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/init.go b/sdk/go/openstack/identity/init.go index 895e05d49..a5ece9d8d 100644 --- a/sdk/go/openstack/identity/init.go +++ b/sdk/go/openstack/identity/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/identity/project.go b/sdk/go/openstack/identity/project.go index 594f4188a..6e8804e9f 100644 --- a/sdk/go/openstack/identity/project.go +++ b/sdk/go/openstack/identity/project.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/pulumiTypes.go b/sdk/go/openstack/identity/pulumiTypes.go index 0178c9f08..d4ae6a09a 100644 --- a/sdk/go/openstack/identity/pulumiTypes.go +++ b/sdk/go/openstack/identity/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/identity/role.go b/sdk/go/openstack/identity/role.go index f6ba40571..c6f0d708f 100644 --- a/sdk/go/openstack/identity/role.go +++ b/sdk/go/openstack/identity/role.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/roleAssignment.go b/sdk/go/openstack/identity/roleAssignment.go index 7eac95d6b..5a672e113 100644 --- a/sdk/go/openstack/identity/roleAssignment.go +++ b/sdk/go/openstack/identity/roleAssignment.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -24,7 +24,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/serviceV3.go b/sdk/go/openstack/identity/serviceV3.go index 13c7288ac..fe66ed4f0 100644 --- a/sdk/go/openstack/identity/serviceV3.go +++ b/sdk/go/openstack/identity/serviceV3.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/user.go b/sdk/go/openstack/identity/user.go index 6f0731039..e6013d247 100644 --- a/sdk/go/openstack/identity/user.go +++ b/sdk/go/openstack/identity/user.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -27,7 +27,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/identity/userMembershipV3.go b/sdk/go/openstack/identity/userMembershipV3.go index b45c72f99..f9a5a79b9 100644 --- a/sdk/go/openstack/identity/userMembershipV3.go +++ b/sdk/go/openstack/identity/userMembershipV3.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -26,7 +26,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/images/getImage.go b/sdk/go/openstack/images/getImage.go index 3cfbdc792..b4655f7ef 100644 --- a/sdk/go/openstack/images/getImage.go +++ b/sdk/go/openstack/images/getImage.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/images" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/images" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -87,10 +87,12 @@ type LookupImageArgs struct { SizeMax *int `pulumi:"sizeMax"` // The minimum size (in bytes) of the image to return. SizeMin *int `pulumi:"sizeMin"` - // Order the results in either `asc` or `desc`. - SortDirection *string `pulumi:"sortDirection"` - // Sort images based on a certain key. Defaults to `name`. - SortKey *string `pulumi:"sortKey"` + // Sorts the response by one or more attribute and sort + // direction combinations. You can also set multiple sort keys and directions. + // Default direction is `desc`. Use the comma (,) character to separate + // multiple values. For example expression `sort = "name:asc,status"` + // sorts ascending by name and descending by status. + Sort *string `pulumi:"sort"` // Search for images with a specific tag. Tag *string `pulumi:"tag"` // A list of tags required to be set on the image @@ -139,12 +141,11 @@ type LookupImageResult struct { // the image or image Schema string `pulumi:"schema"` // The size of the image (in bytes). - SizeBytes int `pulumi:"sizeBytes"` - SizeMax *int `pulumi:"sizeMax"` - SizeMin *int `pulumi:"sizeMin"` - SortDirection *string `pulumi:"sortDirection"` - SortKey *string `pulumi:"sortKey"` - Tag *string `pulumi:"tag"` + SizeBytes int `pulumi:"sizeBytes"` + SizeMax *int `pulumi:"sizeMax"` + SizeMin *int `pulumi:"sizeMin"` + Sort *string `pulumi:"sort"` + Tag *string `pulumi:"tag"` // The tags list of the image. Tags []string `pulumi:"tags"` // The date the image was last updated. @@ -200,10 +201,12 @@ type LookupImageOutputArgs struct { SizeMax pulumi.IntPtrInput `pulumi:"sizeMax"` // The minimum size (in bytes) of the image to return. SizeMin pulumi.IntPtrInput `pulumi:"sizeMin"` - // Order the results in either `asc` or `desc`. - SortDirection pulumi.StringPtrInput `pulumi:"sortDirection"` - // Sort images based on a certain key. Defaults to `name`. - SortKey pulumi.StringPtrInput `pulumi:"sortKey"` + // Sorts the response by one or more attribute and sort + // direction combinations. You can also set multiple sort keys and directions. + // Default direction is `desc`. Use the comma (,) character to separate + // multiple values. For example expression `sort = "name:asc,status"` + // sorts ascending by name and descending by status. + Sort pulumi.StringPtrInput `pulumi:"sort"` // Search for images with a specific tag. Tag pulumi.StringPtrInput `pulumi:"tag"` // A list of tags required to be set on the image @@ -338,12 +341,8 @@ func (o LookupImageResultOutput) SizeMin() pulumi.IntPtrOutput { return o.ApplyT(func(v LookupImageResult) *int { return v.SizeMin }).(pulumi.IntPtrOutput) } -func (o LookupImageResultOutput) SortDirection() pulumi.StringPtrOutput { - return o.ApplyT(func(v LookupImageResult) *string { return v.SortDirection }).(pulumi.StringPtrOutput) -} - -func (o LookupImageResultOutput) SortKey() pulumi.StringPtrOutput { - return o.ApplyT(func(v LookupImageResult) *string { return v.SortKey }).(pulumi.StringPtrOutput) +func (o LookupImageResultOutput) Sort() pulumi.StringPtrOutput { + return o.ApplyT(func(v LookupImageResult) *string { return v.Sort }).(pulumi.StringPtrOutput) } func (o LookupImageResultOutput) Tag() pulumi.StringPtrOutput { diff --git a/sdk/go/openstack/images/getImageIds.go b/sdk/go/openstack/images/getImageIds.go index f8fd91b23..314457927 100644 --- a/sdk/go/openstack/images/getImageIds.go +++ b/sdk/go/openstack/images/getImageIds.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/images" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/images" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -85,21 +85,8 @@ type GetImageIdsArgs struct { // direction combinations. You can also set multiple sort keys and directions. // Default direction is `desc`. Use the comma (,) character to separate // multiple values. For example expression `sort = "name:asc,status"` - // sorts ascending by name and descending by status. `sort` cannot be used - // simultaneously with `sortKey`. If both are present in a configuration - // then only `sort` will be used. + // sorts ascending by name and descending by status. Sort *string `pulumi:"sort"` - // Order the results in either `asc` or `desc`. - // Can be applied only with `sortKey`. Defaults to `asc` - // - // Deprecated: Use option 'sort' instead. - SortDirection *string `pulumi:"sortDirection"` - // Sort images based on a certain key. Defaults to - // `name`. `sortKey` cannot be used simultaneously with `sort`. If both - // are present in a configuration then only `sort` will be used. - // - // Deprecated: Use option 'sort' instead. - SortKey *string `pulumi:"sortKey"` // Search for images with a specific tag. Tag *string `pulumi:"tag"` // A list of tags required to be set on the image @@ -124,13 +111,9 @@ type GetImageIdsResult struct { SizeMax *int `pulumi:"sizeMax"` SizeMin *int `pulumi:"sizeMin"` Sort *string `pulumi:"sort"` - // Deprecated: Use option 'sort' instead. - SortDirection *string `pulumi:"sortDirection"` - // Deprecated: Use option 'sort' instead. - SortKey *string `pulumi:"sortKey"` - Tag *string `pulumi:"tag"` - Tags []string `pulumi:"tags"` - Visibility *string `pulumi:"visibility"` + Tag *string `pulumi:"tag"` + Tags []string `pulumi:"tags"` + Visibility *string `pulumi:"visibility"` } func GetImageIdsOutput(ctx *pulumi.Context, args GetImageIdsOutputArgs, opts ...pulumi.InvokeOption) GetImageIdsResultOutput { @@ -178,21 +161,8 @@ type GetImageIdsOutputArgs struct { // direction combinations. You can also set multiple sort keys and directions. // Default direction is `desc`. Use the comma (,) character to separate // multiple values. For example expression `sort = "name:asc,status"` - // sorts ascending by name and descending by status. `sort` cannot be used - // simultaneously with `sortKey`. If both are present in a configuration - // then only `sort` will be used. + // sorts ascending by name and descending by status. Sort pulumi.StringPtrInput `pulumi:"sort"` - // Order the results in either `asc` or `desc`. - // Can be applied only with `sortKey`. Defaults to `asc` - // - // Deprecated: Use option 'sort' instead. - SortDirection pulumi.StringPtrInput `pulumi:"sortDirection"` - // Sort images based on a certain key. Defaults to - // `name`. `sortKey` cannot be used simultaneously with `sort`. If both - // are present in a configuration then only `sort` will be used. - // - // Deprecated: Use option 'sort' instead. - SortKey pulumi.StringPtrInput `pulumi:"sortKey"` // Search for images with a specific tag. Tag pulumi.StringPtrInput `pulumi:"tag"` // A list of tags required to be set on the image @@ -267,16 +237,6 @@ func (o GetImageIdsResultOutput) Sort() pulumi.StringPtrOutput { return o.ApplyT(func(v GetImageIdsResult) *string { return v.Sort }).(pulumi.StringPtrOutput) } -// Deprecated: Use option 'sort' instead. -func (o GetImageIdsResultOutput) SortDirection() pulumi.StringPtrOutput { - return o.ApplyT(func(v GetImageIdsResult) *string { return v.SortDirection }).(pulumi.StringPtrOutput) -} - -// Deprecated: Use option 'sort' instead. -func (o GetImageIdsResultOutput) SortKey() pulumi.StringPtrOutput { - return o.ApplyT(func(v GetImageIdsResult) *string { return v.SortKey }).(pulumi.StringPtrOutput) -} - func (o GetImageIdsResultOutput) Tag() pulumi.StringPtrOutput { return o.ApplyT(func(v GetImageIdsResult) *string { return v.Tag }).(pulumi.StringPtrOutput) } diff --git a/sdk/go/openstack/images/image.go b/sdk/go/openstack/images/image.go index 8e26832d8..e56b01a93 100644 --- a/sdk/go/openstack/images/image.go +++ b/sdk/go/openstack/images/image.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -25,7 +25,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/images" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/images" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -152,10 +152,6 @@ type Image struct { // The tags of the image. It must be a list of strings. // At this time, it is not possible to delete all tags of an image. Tags pulumi.StringArrayOutput `pulumi:"tags"` - // (**Deprecated** - use `updatedAt` instead) - // - // Deprecated: Use updatedAt instead - UpdateAt pulumi.StringOutput `pulumi:"updateAt"` // The date the image was last updated. UpdatedAt pulumi.StringOutput `pulumi:"updatedAt"` // If false, the checksum will not be verified @@ -291,10 +287,6 @@ type imageState struct { // The tags of the image. It must be a list of strings. // At this time, it is not possible to delete all tags of an image. Tags []string `pulumi:"tags"` - // (**Deprecated** - use `updatedAt` instead) - // - // Deprecated: Use updatedAt instead - UpdateAt *string `pulumi:"updateAt"` // The date the image was last updated. UpdatedAt *string `pulumi:"updatedAt"` // If false, the checksum will not be verified @@ -388,10 +380,6 @@ type ImageState struct { // The tags of the image. It must be a list of strings. // At this time, it is not possible to delete all tags of an image. Tags pulumi.StringArrayInput - // (**Deprecated** - use `updatedAt` instead) - // - // Deprecated: Use updatedAt instead - UpdateAt pulumi.StringPtrInput // The date the image was last updated. UpdatedAt pulumi.StringPtrInput // If false, the checksum will not be verified @@ -789,13 +777,6 @@ func (o ImageOutput) Tags() pulumi.StringArrayOutput { return o.ApplyT(func(v *Image) pulumi.StringArrayOutput { return v.Tags }).(pulumi.StringArrayOutput) } -// (**Deprecated** - use `updatedAt` instead) -// -// Deprecated: Use updatedAt instead -func (o ImageOutput) UpdateAt() pulumi.StringOutput { - return o.ApplyT(func(v *Image) pulumi.StringOutput { return v.UpdateAt }).(pulumi.StringOutput) -} - // The date the image was last updated. func (o ImageOutput) UpdatedAt() pulumi.StringOutput { return o.ApplyT(func(v *Image) pulumi.StringOutput { return v.UpdatedAt }).(pulumi.StringOutput) diff --git a/sdk/go/openstack/images/imageAccess.go b/sdk/go/openstack/images/imageAccess.go index c89a1d86e..dfae1da27 100644 --- a/sdk/go/openstack/images/imageAccess.go +++ b/sdk/go/openstack/images/imageAccess.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -27,7 +27,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/images" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/images" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -70,7 +70,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/images" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/images" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/images/imageAccessAccept.go b/sdk/go/openstack/images/imageAccessAccept.go index b1ea99fb4..54a238ea5 100644 --- a/sdk/go/openstack/images/imageAccessAccept.go +++ b/sdk/go/openstack/images/imageAccessAccept.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -24,7 +24,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/images" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/images" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/images/init.go b/sdk/go/openstack/images/init.go index 087d738b0..85b22700b 100644 --- a/sdk/go/openstack/images/init.go +++ b/sdk/go/openstack/images/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/init.go b/sdk/go/openstack/init.go index 8c14309d9..fd9a4fbfe 100644 --- a/sdk/go/openstack/init.go +++ b/sdk/go/openstack/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/internal/pulumiUtilities.go b/sdk/go/openstack/internal/pulumiUtilities.go index e5a7ad2dc..9155d8065 100644 --- a/sdk/go/openstack/internal/pulumiUtilities.go +++ b/sdk/go/openstack/internal/pulumiUtilities.go @@ -165,7 +165,7 @@ func callPlainInner( func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOption { defaults := []pulumi.ResourceOption{} - version := semver.MustParse("3.0.0-alpha.0+dev") + version := semver.MustParse("4.0.0-alpha.0+dev") if !version.Equals(semver.Version{}) { defaults = append(defaults, pulumi.Version(version.String())) } @@ -176,7 +176,7 @@ func PkgResourceDefaultOpts(opts []pulumi.ResourceOption) []pulumi.ResourceOptio func PkgInvokeDefaultOpts(opts []pulumi.InvokeOption) []pulumi.InvokeOption { defaults := []pulumi.InvokeOption{} - version := semver.MustParse("3.0.0-alpha.0+dev") + version := semver.MustParse("4.0.0-alpha.0+dev") if !version.Equals(semver.Version{}) { defaults = append(defaults, pulumi.Version(version.String())) } diff --git a/sdk/go/openstack/keymanager/containerV1.go b/sdk/go/openstack/keymanager/containerV1.go index e21961a32..ed2b8453d 100644 --- a/sdk/go/openstack/keymanager/containerV1.go +++ b/sdk/go/openstack/keymanager/containerV1.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -25,9 +25,9 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/keymanager" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/keymanager" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi-std/sdk/go/std" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // @@ -139,7 +139,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/keymanager" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/keymanager" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/keymanager/getContainer.go b/sdk/go/openstack/keymanager/getContainer.go index 69b2732cb..6895379a2 100644 --- a/sdk/go/openstack/keymanager/getContainer.go +++ b/sdk/go/openstack/keymanager/getContainer.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/keymanager" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/keymanager" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/keymanager/getSecret.go b/sdk/go/openstack/keymanager/getSecret.go index 6180f2bbe..76cb71443 100644 --- a/sdk/go/openstack/keymanager/getSecret.go +++ b/sdk/go/openstack/keymanager/getSecret.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -18,7 +18,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/keymanager" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/keymanager" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -54,7 +54,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/keymanager" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/keymanager" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/keymanager/init.go b/sdk/go/openstack/keymanager/init.go index dc3f232ae..bbcdac524 100644 --- a/sdk/go/openstack/keymanager/init.go +++ b/sdk/go/openstack/keymanager/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/keymanager/orderV1.go b/sdk/go/openstack/keymanager/orderV1.go index d1e05c9e4..02df40b3b 100644 --- a/sdk/go/openstack/keymanager/orderV1.go +++ b/sdk/go/openstack/keymanager/orderV1.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/keymanager" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/keymanager" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -55,7 +55,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/keymanager" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/keymanager" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/keymanager/pulumiTypes.go b/sdk/go/openstack/keymanager/pulumiTypes.go index 01e547136..abca5d3a9 100644 --- a/sdk/go/openstack/keymanager/pulumiTypes.go +++ b/sdk/go/openstack/keymanager/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/keymanager/secretV1.go b/sdk/go/openstack/keymanager/secretV1.go index 8d00580ee..edae98ed3 100644 --- a/sdk/go/openstack/keymanager/secretV1.go +++ b/sdk/go/openstack/keymanager/secretV1.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/keymanager" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/keymanager" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -61,7 +61,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/keymanager" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/keymanager" // "github.com/pulumi/pulumi-std/sdk/go/std" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // @@ -100,7 +100,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/keymanager" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/keymanager" // "github.com/pulumi/pulumi-std/sdk/go/std" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // diff --git a/sdk/go/openstack/loadbalancer/getFlavorV2.go b/sdk/go/openstack/loadbalancer/getFlavorV2.go new file mode 100644 index 000000000..9742ebcaf --- /dev/null +++ b/sdk/go/openstack/loadbalancer/getFlavorV2.go @@ -0,0 +1,113 @@ +// Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. +// *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** + +package loadbalancer + +import ( + "context" + "reflect" + + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" + "github.com/pulumi/pulumi/sdk/v3/go/pulumi" +) + +func GetFlavorV2(ctx *pulumi.Context, args *GetFlavorV2Args, opts ...pulumi.InvokeOption) (*GetFlavorV2Result, error) { + opts = internal.PkgInvokeDefaultOpts(opts) + var rv GetFlavorV2Result + err := ctx.Invoke("openstack:loadbalancer/getFlavorV2:getFlavorV2", args, &rv, opts...) + if err != nil { + return nil, err + } + return &rv, nil +} + +// A collection of arguments for invoking getFlavorV2. +type GetFlavorV2Args struct { + FlavorId *string `pulumi:"flavorId"` + Name *string `pulumi:"name"` + Region *string `pulumi:"region"` +} + +// A collection of values returned by getFlavorV2. +type GetFlavorV2Result struct { + Description string `pulumi:"description"` + Enabled bool `pulumi:"enabled"` + FlavorId string `pulumi:"flavorId"` + FlavorProfileId string `pulumi:"flavorProfileId"` + // The provider-assigned unique ID for this managed resource. + Id string `pulumi:"id"` + Name string `pulumi:"name"` + Region *string `pulumi:"region"` +} + +func GetFlavorV2Output(ctx *pulumi.Context, args GetFlavorV2OutputArgs, opts ...pulumi.InvokeOption) GetFlavorV2ResultOutput { + return pulumi.ToOutputWithContext(context.Background(), args). + ApplyT(func(v interface{}) (GetFlavorV2Result, error) { + args := v.(GetFlavorV2Args) + r, err := GetFlavorV2(ctx, &args, opts...) + var s GetFlavorV2Result + if r != nil { + s = *r + } + return s, err + }).(GetFlavorV2ResultOutput) +} + +// A collection of arguments for invoking getFlavorV2. +type GetFlavorV2OutputArgs struct { + FlavorId pulumi.StringPtrInput `pulumi:"flavorId"` + Name pulumi.StringPtrInput `pulumi:"name"` + Region pulumi.StringPtrInput `pulumi:"region"` +} + +func (GetFlavorV2OutputArgs) ElementType() reflect.Type { + return reflect.TypeOf((*GetFlavorV2Args)(nil)).Elem() +} + +// A collection of values returned by getFlavorV2. +type GetFlavorV2ResultOutput struct{ *pulumi.OutputState } + +func (GetFlavorV2ResultOutput) ElementType() reflect.Type { + return reflect.TypeOf((*GetFlavorV2Result)(nil)).Elem() +} + +func (o GetFlavorV2ResultOutput) ToGetFlavorV2ResultOutput() GetFlavorV2ResultOutput { + return o +} + +func (o GetFlavorV2ResultOutput) ToGetFlavorV2ResultOutputWithContext(ctx context.Context) GetFlavorV2ResultOutput { + return o +} + +func (o GetFlavorV2ResultOutput) Description() pulumi.StringOutput { + return o.ApplyT(func(v GetFlavorV2Result) string { return v.Description }).(pulumi.StringOutput) +} + +func (o GetFlavorV2ResultOutput) Enabled() pulumi.BoolOutput { + return o.ApplyT(func(v GetFlavorV2Result) bool { return v.Enabled }).(pulumi.BoolOutput) +} + +func (o GetFlavorV2ResultOutput) FlavorId() pulumi.StringOutput { + return o.ApplyT(func(v GetFlavorV2Result) string { return v.FlavorId }).(pulumi.StringOutput) +} + +func (o GetFlavorV2ResultOutput) FlavorProfileId() pulumi.StringOutput { + return o.ApplyT(func(v GetFlavorV2Result) string { return v.FlavorProfileId }).(pulumi.StringOutput) +} + +// The provider-assigned unique ID for this managed resource. +func (o GetFlavorV2ResultOutput) Id() pulumi.StringOutput { + return o.ApplyT(func(v GetFlavorV2Result) string { return v.Id }).(pulumi.StringOutput) +} + +func (o GetFlavorV2ResultOutput) Name() pulumi.StringOutput { + return o.ApplyT(func(v GetFlavorV2Result) string { return v.Name }).(pulumi.StringOutput) +} + +func (o GetFlavorV2ResultOutput) Region() pulumi.StringPtrOutput { + return o.ApplyT(func(v GetFlavorV2Result) *string { return v.Region }).(pulumi.StringPtrOutput) +} + +func init() { + pulumi.RegisterOutputType(GetFlavorV2ResultOutput{}) +} diff --git a/sdk/go/openstack/loadbalancer/init.go b/sdk/go/openstack/loadbalancer/init.go index a3483d29d..b4ce4b84f 100644 --- a/sdk/go/openstack/loadbalancer/init.go +++ b/sdk/go/openstack/loadbalancer/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/loadbalancer/l7policyV2.go b/sdk/go/openstack/loadbalancer/l7policyV2.go index 3c6387ada..832bcce5c 100644 --- a/sdk/go/openstack/loadbalancer/l7policyV2.go +++ b/sdk/go/openstack/loadbalancer/l7policyV2.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,8 +21,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/loadbalancer/l7ruleV2.go b/sdk/go/openstack/loadbalancer/l7ruleV2.go index e8a752c6a..402b12d5c 100644 --- a/sdk/go/openstack/loadbalancer/l7ruleV2.go +++ b/sdk/go/openstack/loadbalancer/l7ruleV2.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,8 +21,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/loadbalancer/listener.go b/sdk/go/openstack/loadbalancer/listener.go index 79d4637ff..3a8084404 100644 --- a/sdk/go/openstack/loadbalancer/listener.go +++ b/sdk/go/openstack/loadbalancer/listener.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -24,7 +24,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -89,8 +89,8 @@ type Listener struct { // to be unique. Name pulumi.StringOutput `pulumi:"name"` // The protocol - can either be TCP, HTTP, HTTPS, - // TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only - // in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in + // TERMINATED_HTTPS, UDP, SCTP (supported only in + // **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in // **Octavia minor version >=2.25**). Changing this creates a new Listener. Protocol pulumi.StringOutput `pulumi:"protocol"` // The port on which to listen for client traffic. @@ -192,8 +192,8 @@ type listenerState struct { // to be unique. Name *string `pulumi:"name"` // The protocol - can either be TCP, HTTP, HTTPS, - // TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only - // in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in + // TERMINATED_HTTPS, UDP, SCTP (supported only in + // **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in // **Octavia minor version >=2.25**). Changing this creates a new Listener. Protocol *string `pulumi:"protocol"` // The port on which to listen for client traffic. @@ -257,8 +257,8 @@ type ListenerState struct { // to be unique. Name pulumi.StringPtrInput // The protocol - can either be TCP, HTTP, HTTPS, - // TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only - // in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in + // TERMINATED_HTTPS, UDP, SCTP (supported only in + // **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in // **Octavia minor version >=2.25**). Changing this creates a new Listener. Protocol pulumi.StringPtrInput // The port on which to listen for client traffic. @@ -326,8 +326,8 @@ type listenerArgs struct { // to be unique. Name *string `pulumi:"name"` // The protocol - can either be TCP, HTTP, HTTPS, - // TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only - // in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in + // TERMINATED_HTTPS, UDP, SCTP (supported only in + // **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in // **Octavia minor version >=2.25**). Changing this creates a new Listener. Protocol string `pulumi:"protocol"` // The port on which to listen for client traffic. @@ -392,8 +392,8 @@ type ListenerArgs struct { // to be unique. Name pulumi.StringPtrInput // The protocol - can either be TCP, HTTP, HTTPS, - // TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only - // in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in + // TERMINATED_HTTPS, UDP, SCTP (supported only in + // **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in // **Octavia minor version >=2.25**). Changing this creates a new Listener. Protocol pulumi.StringInput // The port on which to listen for client traffic. @@ -570,8 +570,8 @@ func (o ListenerOutput) Name() pulumi.StringOutput { } // The protocol - can either be TCP, HTTP, HTTPS, -// TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only -// in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in +// TERMINATED_HTTPS, UDP, SCTP (supported only in +// **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in // **Octavia minor version >=2.25**). Changing this creates a new Listener. func (o ListenerOutput) Protocol() pulumi.StringOutput { return o.ApplyT(func(v *Listener) pulumi.StringOutput { return v.Protocol }).(pulumi.StringOutput) diff --git a/sdk/go/openstack/loadbalancer/loadBalancer.go b/sdk/go/openstack/loadbalancer/loadBalancer.go index 7c3c268c8..f4d6fcc3e 100644 --- a/sdk/go/openstack/loadbalancer/loadBalancer.go +++ b/sdk/go/openstack/loadbalancer/loadBalancer.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/loadbalancer/member.go b/sdk/go/openstack/loadbalancer/member.go index 062550943..9041ac091 100644 --- a/sdk/go/openstack/loadbalancer/member.go +++ b/sdk/go/openstack/loadbalancer/member.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/loadbalancer/memberV1.go b/sdk/go/openstack/loadbalancer/memberV1.go index 3b0182558..7c2fbe13e 100644 --- a/sdk/go/openstack/loadbalancer/memberV1.go +++ b/sdk/go/openstack/loadbalancer/memberV1.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/loadbalancer/members.go b/sdk/go/openstack/loadbalancer/members.go index ef818ca6d..a1ca5992c 100644 --- a/sdk/go/openstack/loadbalancer/members.go +++ b/sdk/go/openstack/loadbalancer/members.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -17,10 +17,6 @@ import ( // > **Note:** This resource has attributes that depend on octavia minor versions. // Please ensure your Openstack cloud supports the required minor version. // -// > **Note:** This resource works only within Octavia API. For -// legacy Neutron LBaaS v2 extension please use -// loadbalancer.Member resource. -// // ## Example Usage // // ```go @@ -28,7 +24,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/loadbalancer/monitor.go b/sdk/go/openstack/loadbalancer/monitor.go index 85fa6c8c1..74c38717b 100644 --- a/sdk/go/openstack/loadbalancer/monitor.go +++ b/sdk/go/openstack/loadbalancer/monitor.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/loadbalancer/monitorV1.go b/sdk/go/openstack/loadbalancer/monitorV1.go index 8822c0236..be58f1a5e 100644 --- a/sdk/go/openstack/loadbalancer/monitorV1.go +++ b/sdk/go/openstack/loadbalancer/monitorV1.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/loadbalancer/pool.go b/sdk/go/openstack/loadbalancer/pool.go index c553eb952..495e68991 100644 --- a/sdk/go/openstack/loadbalancer/pool.go +++ b/sdk/go/openstack/loadbalancer/pool.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -24,7 +24,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -66,8 +66,7 @@ type Pool struct { Description pulumi.StringPtrOutput `pulumi:"description"` // The load balancing algorithm to // distribute traffic to the pool's members. Must be one of - // ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only - // in Octavia). + // ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT. LbMethod pulumi.StringOutput `pulumi:"lbMethod"` // The Listener on which the members of the pool // will be associated with. Changing this creates a new pool. @@ -84,8 +83,8 @@ type Pool struct { // member or not. Changing this creates a new pool. Persistence PoolPersistenceOutput `pulumi:"persistence"` // The protocol - can either be TCP, HTTP, HTTPS, PROXY, - // UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**) - // or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool. + // UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP + // (**Octavia minor version >= 2.23**). Changing this creates a new pool. Protocol pulumi.StringOutput `pulumi:"protocol"` // The region in which to obtain the V2 Networking client. // A Networking client is needed to create an . If omitted, the @@ -141,8 +140,7 @@ type poolState struct { Description *string `pulumi:"description"` // The load balancing algorithm to // distribute traffic to the pool's members. Must be one of - // ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only - // in Octavia). + // ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT. LbMethod *string `pulumi:"lbMethod"` // The Listener on which the members of the pool // will be associated with. Changing this creates a new pool. @@ -159,8 +157,8 @@ type poolState struct { // member or not. Changing this creates a new pool. Persistence *PoolPersistence `pulumi:"persistence"` // The protocol - can either be TCP, HTTP, HTTPS, PROXY, - // UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**) - // or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool. + // UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP + // (**Octavia minor version >= 2.23**). Changing this creates a new pool. Protocol *string `pulumi:"protocol"` // The region in which to obtain the V2 Networking client. // A Networking client is needed to create an . If omitted, the @@ -181,8 +179,7 @@ type PoolState struct { Description pulumi.StringPtrInput // The load balancing algorithm to // distribute traffic to the pool's members. Must be one of - // ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only - // in Octavia). + // ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT. LbMethod pulumi.StringPtrInput // The Listener on which the members of the pool // will be associated with. Changing this creates a new pool. @@ -199,8 +196,8 @@ type PoolState struct { // member or not. Changing this creates a new pool. Persistence PoolPersistencePtrInput // The protocol - can either be TCP, HTTP, HTTPS, PROXY, - // UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**) - // or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool. + // UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP + // (**Octavia minor version >= 2.23**). Changing this creates a new pool. Protocol pulumi.StringPtrInput // The region in which to obtain the V2 Networking client. // A Networking client is needed to create an . If omitted, the @@ -225,8 +222,7 @@ type poolArgs struct { Description *string `pulumi:"description"` // The load balancing algorithm to // distribute traffic to the pool's members. Must be one of - // ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only - // in Octavia). + // ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT. LbMethod string `pulumi:"lbMethod"` // The Listener on which the members of the pool // will be associated with. Changing this creates a new pool. @@ -243,8 +239,8 @@ type poolArgs struct { // member or not. Changing this creates a new pool. Persistence *PoolPersistence `pulumi:"persistence"` // The protocol - can either be TCP, HTTP, HTTPS, PROXY, - // UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**) - // or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool. + // UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP + // (**Octavia minor version >= 2.23**). Changing this creates a new pool. Protocol string `pulumi:"protocol"` // The region in which to obtain the V2 Networking client. // A Networking client is needed to create an . If omitted, the @@ -266,8 +262,7 @@ type PoolArgs struct { Description pulumi.StringPtrInput // The load balancing algorithm to // distribute traffic to the pool's members. Must be one of - // ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only - // in Octavia). + // ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT. LbMethod pulumi.StringInput // The Listener on which the members of the pool // will be associated with. Changing this creates a new pool. @@ -284,8 +279,8 @@ type PoolArgs struct { // member or not. Changing this creates a new pool. Persistence PoolPersistencePtrInput // The protocol - can either be TCP, HTTP, HTTPS, PROXY, - // UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**) - // or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool. + // UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP + // (**Octavia minor version >= 2.23**). Changing this creates a new pool. Protocol pulumi.StringInput // The region in which to obtain the V2 Networking client. // A Networking client is needed to create an . If omitted, the @@ -398,8 +393,7 @@ func (o PoolOutput) Description() pulumi.StringPtrOutput { // The load balancing algorithm to // distribute traffic to the pool's members. Must be one of -// ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only -// in Octavia). +// ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT. func (o PoolOutput) LbMethod() pulumi.StringOutput { return o.ApplyT(func(v *Pool) pulumi.StringOutput { return v.LbMethod }).(pulumi.StringOutput) } @@ -431,8 +425,8 @@ func (o PoolOutput) Persistence() PoolPersistenceOutput { } // The protocol - can either be TCP, HTTP, HTTPS, PROXY, -// UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**) -// or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool. +// UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP +// (**Octavia minor version >= 2.23**). Changing this creates a new pool. func (o PoolOutput) Protocol() pulumi.StringOutput { return o.ApplyT(func(v *Pool) pulumi.StringOutput { return v.Protocol }).(pulumi.StringOutput) } diff --git a/sdk/go/openstack/loadbalancer/poolV1.go b/sdk/go/openstack/loadbalancer/poolV1.go index 35980f66b..f52c286a6 100644 --- a/sdk/go/openstack/loadbalancer/poolV1.go +++ b/sdk/go/openstack/loadbalancer/poolV1.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -54,9 +54,9 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -183,10 +183,6 @@ import ( // // ``` // -// ## Notes -// -// The `member` block is deprecated in favor of the `loadbalancer.MemberV1` resource. -// // ## Import // // Load Balancer Pools can be imported using the `id`, e.g. @@ -204,13 +200,6 @@ type PoolV1 struct { // The backend load balancing provider. For example: // `haproxy`, `F5`, etc. LbProvider pulumi.StringOutput `pulumi:"lbProvider"` - // An existing node to add to the pool. Changing this - // updates the members of the pool. The member object structure is documented - // below. Please note that the `member` block is deprecated in favor of the - // `loadbalancer.MemberV1` resource. - // - // Deprecated: Use loadbalancer.MemberV1 instead - Members pulumi.StringArrayOutput `pulumi:"members"` // A list of IDs of monitors to associate with the // pool. MonitorIds pulumi.StringArrayOutput `pulumi:"monitorIds"` @@ -280,13 +269,6 @@ type poolV1State struct { // The backend load balancing provider. For example: // `haproxy`, `F5`, etc. LbProvider *string `pulumi:"lbProvider"` - // An existing node to add to the pool. Changing this - // updates the members of the pool. The member object structure is documented - // below. Please note that the `member` block is deprecated in favor of the - // `loadbalancer.MemberV1` resource. - // - // Deprecated: Use loadbalancer.MemberV1 instead - Members []string `pulumi:"members"` // A list of IDs of monitors to associate with the // pool. MonitorIds []string `pulumi:"monitorIds"` @@ -318,13 +300,6 @@ type PoolV1State struct { // The backend load balancing provider. For example: // `haproxy`, `F5`, etc. LbProvider pulumi.StringPtrInput - // An existing node to add to the pool. Changing this - // updates the members of the pool. The member object structure is documented - // below. Please note that the `member` block is deprecated in favor of the - // `loadbalancer.MemberV1` resource. - // - // Deprecated: Use loadbalancer.MemberV1 instead - Members pulumi.StringArrayInput // A list of IDs of monitors to associate with the // pool. MonitorIds pulumi.StringArrayInput @@ -360,13 +335,6 @@ type poolV1Args struct { // The backend load balancing provider. For example: // `haproxy`, `F5`, etc. LbProvider *string `pulumi:"lbProvider"` - // An existing node to add to the pool. Changing this - // updates the members of the pool. The member object structure is documented - // below. Please note that the `member` block is deprecated in favor of the - // `loadbalancer.MemberV1` resource. - // - // Deprecated: Use loadbalancer.MemberV1 instead - Members []string `pulumi:"members"` // A list of IDs of monitors to associate with the // pool. MonitorIds []string `pulumi:"monitorIds"` @@ -399,13 +367,6 @@ type PoolV1Args struct { // The backend load balancing provider. For example: // `haproxy`, `F5`, etc. LbProvider pulumi.StringPtrInput - // An existing node to add to the pool. Changing this - // updates the members of the pool. The member object structure is documented - // below. Please note that the `member` block is deprecated in favor of the - // `loadbalancer.MemberV1` resource. - // - // Deprecated: Use loadbalancer.MemberV1 instead - Members pulumi.StringArrayInput // A list of IDs of monitors to associate with the // pool. MonitorIds pulumi.StringArrayInput @@ -529,16 +490,6 @@ func (o PoolV1Output) LbProvider() pulumi.StringOutput { return o.ApplyT(func(v *PoolV1) pulumi.StringOutput { return v.LbProvider }).(pulumi.StringOutput) } -// An existing node to add to the pool. Changing this -// updates the members of the pool. The member object structure is documented -// below. Please note that the `member` block is deprecated in favor of the -// `loadbalancer.MemberV1` resource. -// -// Deprecated: Use loadbalancer.MemberV1 instead -func (o PoolV1Output) Members() pulumi.StringArrayOutput { - return o.ApplyT(func(v *PoolV1) pulumi.StringArrayOutput { return v.Members }).(pulumi.StringArrayOutput) -} - // A list of IDs of monitors to associate with the // pool. func (o PoolV1Output) MonitorIds() pulumi.StringArrayOutput { diff --git a/sdk/go/openstack/loadbalancer/pulumiTypes.go b/sdk/go/openstack/loadbalancer/pulumiTypes.go index 4ac5535df..afca39afd 100644 --- a/sdk/go/openstack/loadbalancer/pulumiTypes.go +++ b/sdk/go/openstack/loadbalancer/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/loadbalancer/quota.go b/sdk/go/openstack/loadbalancer/quota.go index adae5ee49..474b2a7d2 100644 --- a/sdk/go/openstack/loadbalancer/quota.go +++ b/sdk/go/openstack/loadbalancer/quota.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -16,8 +16,6 @@ import ( // // > **Note:** This usually requires admin privileges. // -// > **Note:** This resource is only available for Octavia. -// // > **Note:** This resource has a no-op deletion so no actual actions will be done against the OpenStack // // API in case of delete call. @@ -36,8 +34,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/loadbalancer/vip.go b/sdk/go/openstack/loadbalancer/vip.go index 7b9d438d5..ae544d54f 100644 --- a/sdk/go/openstack/loadbalancer/vip.go +++ b/sdk/go/openstack/loadbalancer/vip.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/loadbalancer" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/loadbalancer" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/addressScope.go b/sdk/go/openstack/networking/addressScope.go index d8b1258d2..b527d7d68 100644 --- a/sdk/go/openstack/networking/addressScope.go +++ b/sdk/go/openstack/networking/addressScope.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -49,7 +49,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/floatingIp.go b/sdk/go/openstack/networking/floatingIp.go index 2ceb7b41a..598b84bdb 100644 --- a/sdk/go/openstack/networking/floatingIp.go +++ b/sdk/go/openstack/networking/floatingIp.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/networking/floatingIpAssociate.go b/sdk/go/openstack/networking/floatingIpAssociate.go index b8d0a195c..542efe333 100644 --- a/sdk/go/openstack/networking/floatingIpAssociate.go +++ b/sdk/go/openstack/networking/floatingIpAssociate.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getAddressScope.go b/sdk/go/openstack/networking/getAddressScope.go index 072fba112..bfeb1c57c 100644 --- a/sdk/go/openstack/networking/getAddressScope.go +++ b/sdk/go/openstack/networking/getAddressScope.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getFloatingIp.go b/sdk/go/openstack/networking/getFloatingIp.go index 31f7de208..9f4066e6d 100644 --- a/sdk/go/openstack/networking/getFloatingIp.go +++ b/sdk/go/openstack/networking/getFloatingIp.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -56,7 +56,7 @@ type LookupFloatingIpArgs struct { Description *string `pulumi:"description"` // The specific IP address of the internal port which should be associated with the floating IP. FixedIp *string `pulumi:"fixedIp"` - // The name of the pool from which the floating IP belongs to. + // The ID of the network from which the floating IP belongs to. Pool *string `pulumi:"pool"` // The ID of the port the floating IP is attached. PortId *string `pulumi:"portId"` @@ -116,7 +116,7 @@ type LookupFloatingIpOutputArgs struct { Description pulumi.StringPtrInput `pulumi:"description"` // The specific IP address of the internal port which should be associated with the floating IP. FixedIp pulumi.StringPtrInput `pulumi:"fixedIp"` - // The name of the pool from which the floating IP belongs to. + // The ID of the network from which the floating IP belongs to. Pool pulumi.StringPtrInput `pulumi:"pool"` // The ID of the port the floating IP is attached. PortId pulumi.StringPtrInput `pulumi:"portId"` diff --git a/sdk/go/openstack/networking/getNetwork.go b/sdk/go/openstack/networking/getNetwork.go index bca0a77ab..d9e28beff 100644 --- a/sdk/go/openstack/networking/getNetwork.go +++ b/sdk/go/openstack/networking/getNetwork.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getPort.go b/sdk/go/openstack/networking/getPort.go index c4309a94d..602a9b573 100644 --- a/sdk/go/openstack/networking/getPort.go +++ b/sdk/go/openstack/networking/getPort.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getPortIds.go b/sdk/go/openstack/networking/getPortIds.go index 5e7e8fc98..ce899dd9b 100644 --- a/sdk/go/openstack/networking/getPortIds.go +++ b/sdk/go/openstack/networking/getPortIds.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getQosBandwidthLimitRule.go b/sdk/go/openstack/networking/getQosBandwidthLimitRule.go index f7622a31b..5c6c3e7dd 100644 --- a/sdk/go/openstack/networking/getQosBandwidthLimitRule.go +++ b/sdk/go/openstack/networking/getQosBandwidthLimitRule.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getQosDscpMarkingRule.go b/sdk/go/openstack/networking/getQosDscpMarkingRule.go index 3ae53be0b..0e3cb9ead 100644 --- a/sdk/go/openstack/networking/getQosDscpMarkingRule.go +++ b/sdk/go/openstack/networking/getQosDscpMarkingRule.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getQosMinimumBandwidthRule.go b/sdk/go/openstack/networking/getQosMinimumBandwidthRule.go index 5f9bfbd68..2d4f78be7 100644 --- a/sdk/go/openstack/networking/getQosMinimumBandwidthRule.go +++ b/sdk/go/openstack/networking/getQosMinimumBandwidthRule.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getQosPolicy.go b/sdk/go/openstack/networking/getQosPolicy.go index e8dbc5c5f..520cba519 100644 --- a/sdk/go/openstack/networking/getQosPolicy.go +++ b/sdk/go/openstack/networking/getQosPolicy.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getQuotaV2.go b/sdk/go/openstack/networking/getQuotaV2.go index 9749fc849..336820d33 100644 --- a/sdk/go/openstack/networking/getQuotaV2.go +++ b/sdk/go/openstack/networking/getQuotaV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getRouter.go b/sdk/go/openstack/networking/getRouter.go index 3f061a2bb..da97b57fc 100644 --- a/sdk/go/openstack/networking/getRouter.go +++ b/sdk/go/openstack/networking/getRouter.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getSecGroup.go b/sdk/go/openstack/networking/getSecGroup.go index 5eda92073..adf886766 100644 --- a/sdk/go/openstack/networking/getSecGroup.go +++ b/sdk/go/openstack/networking/getSecGroup.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getSubnet.go b/sdk/go/openstack/networking/getSubnet.go index 15d38afc3..e02914fe8 100644 --- a/sdk/go/openstack/networking/getSubnet.go +++ b/sdk/go/openstack/networking/getSubnet.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -54,8 +54,6 @@ type LookupSubnetArgs struct { Cidr *string `pulumi:"cidr"` // Human-readable description of the subnet. Description *string `pulumi:"description"` - // Deprecated: use dhcpEnabled instead - DhcpDisabled *bool `pulumi:"dhcpDisabled"` // If the subnet has DHCP enabled. DhcpEnabled *bool `pulumi:"dhcpEnabled"` // The IP of the subnet's gateway. @@ -94,9 +92,7 @@ type LookupSubnetResult struct { AllocationPools []GetSubnetAllocationPool `pulumi:"allocationPools"` Cidr string `pulumi:"cidr"` Description string `pulumi:"description"` - // Deprecated: use dhcpEnabled instead - DhcpDisabled *bool `pulumi:"dhcpDisabled"` - DhcpEnabled *bool `pulumi:"dhcpEnabled"` + DhcpEnabled *bool `pulumi:"dhcpEnabled"` // DNS Nameservers of the subnet. DnsNameservers []string `pulumi:"dnsNameservers"` // Whether the subnet has DHCP enabled or not. @@ -140,8 +136,6 @@ type LookupSubnetOutputArgs struct { Cidr pulumi.StringPtrInput `pulumi:"cidr"` // Human-readable description of the subnet. Description pulumi.StringPtrInput `pulumi:"description"` - // Deprecated: use dhcpEnabled instead - DhcpDisabled pulumi.BoolPtrInput `pulumi:"dhcpDisabled"` // If the subnet has DHCP enabled. DhcpEnabled pulumi.BoolPtrInput `pulumi:"dhcpEnabled"` // The IP of the subnet's gateway. @@ -209,11 +203,6 @@ func (o LookupSubnetResultOutput) Description() pulumi.StringOutput { return o.ApplyT(func(v LookupSubnetResult) string { return v.Description }).(pulumi.StringOutput) } -// Deprecated: use dhcpEnabled instead -func (o LookupSubnetResultOutput) DhcpDisabled() pulumi.BoolPtrOutput { - return o.ApplyT(func(v LookupSubnetResult) *bool { return v.DhcpDisabled }).(pulumi.BoolPtrOutput) -} - func (o LookupSubnetResultOutput) DhcpEnabled() pulumi.BoolPtrOutput { return o.ApplyT(func(v LookupSubnetResult) *bool { return v.DhcpEnabled }).(pulumi.BoolPtrOutput) } diff --git a/sdk/go/openstack/networking/getSubnetIdsV2.go b/sdk/go/openstack/networking/getSubnetIdsV2.go index b85b8c5a2..03ba445af 100644 --- a/sdk/go/openstack/networking/getSubnetIdsV2.go +++ b/sdk/go/openstack/networking/getSubnetIdsV2.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getSubnetPool.go b/sdk/go/openstack/networking/getSubnetPool.go index 1944f740f..24f55c168 100644 --- a/sdk/go/openstack/networking/getSubnetPool.go +++ b/sdk/go/openstack/networking/getSubnetPool.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/getTrunk.go b/sdk/go/openstack/networking/getTrunk.go index 42ae9ec7b..46bb00792 100644 --- a/sdk/go/openstack/networking/getTrunk.go +++ b/sdk/go/openstack/networking/getTrunk.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/init.go b/sdk/go/openstack/networking/init.go index 60a689c2d..e6b30e25b 100644 --- a/sdk/go/openstack/networking/init.go +++ b/sdk/go/openstack/networking/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/networking/network.go b/sdk/go/openstack/networking/network.go index 14237726c..dc3af260f 100644 --- a/sdk/go/openstack/networking/network.go +++ b/sdk/go/openstack/networking/network.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,8 +20,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/port.go b/sdk/go/openstack/networking/port.go index c65f1d540..4bf7e08bf 100644 --- a/sdk/go/openstack/networking/port.go +++ b/sdk/go/openstack/networking/port.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -29,7 +29,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -64,7 +64,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -112,7 +112,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/portForwardingV2.go b/sdk/go/openstack/networking/portForwardingV2.go index 07413325d..a14f57337 100644 --- a/sdk/go/openstack/networking/portForwardingV2.go +++ b/sdk/go/openstack/networking/portForwardingV2.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/portSecGroupAssociate.go b/sdk/go/openstack/networking/portSecGroupAssociate.go index f269e1ae6..45f47ad05 100644 --- a/sdk/go/openstack/networking/portSecGroupAssociate.go +++ b/sdk/go/openstack/networking/portSecGroupAssociate.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -62,7 +62,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -104,7 +104,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/pulumiTypes.go b/sdk/go/openstack/networking/pulumiTypes.go index b5d4b22f2..b0a99f0bf 100644 --- a/sdk/go/openstack/networking/pulumiTypes.go +++ b/sdk/go/openstack/networking/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -1052,218 +1052,6 @@ func (o SubnetAllocationPoolArrayOutput) Index(i pulumi.IntInput) SubnetAllocati }).(SubnetAllocationPoolOutput) } -type SubnetAllocationPoolsCollection struct { - // The ending address. - End string `pulumi:"end"` - // The starting address. - Start string `pulumi:"start"` -} - -// SubnetAllocationPoolsCollectionInput is an input type that accepts SubnetAllocationPoolsCollectionArgs and SubnetAllocationPoolsCollectionOutput values. -// You can construct a concrete instance of `SubnetAllocationPoolsCollectionInput` via: -// -// SubnetAllocationPoolsCollectionArgs{...} -type SubnetAllocationPoolsCollectionInput interface { - pulumi.Input - - ToSubnetAllocationPoolsCollectionOutput() SubnetAllocationPoolsCollectionOutput - ToSubnetAllocationPoolsCollectionOutputWithContext(context.Context) SubnetAllocationPoolsCollectionOutput -} - -type SubnetAllocationPoolsCollectionArgs struct { - // The ending address. - End pulumi.StringInput `pulumi:"end"` - // The starting address. - Start pulumi.StringInput `pulumi:"start"` -} - -func (SubnetAllocationPoolsCollectionArgs) ElementType() reflect.Type { - return reflect.TypeOf((*SubnetAllocationPoolsCollection)(nil)).Elem() -} - -func (i SubnetAllocationPoolsCollectionArgs) ToSubnetAllocationPoolsCollectionOutput() SubnetAllocationPoolsCollectionOutput { - return i.ToSubnetAllocationPoolsCollectionOutputWithContext(context.Background()) -} - -func (i SubnetAllocationPoolsCollectionArgs) ToSubnetAllocationPoolsCollectionOutputWithContext(ctx context.Context) SubnetAllocationPoolsCollectionOutput { - return pulumi.ToOutputWithContext(ctx, i).(SubnetAllocationPoolsCollectionOutput) -} - -// SubnetAllocationPoolsCollectionArrayInput is an input type that accepts SubnetAllocationPoolsCollectionArray and SubnetAllocationPoolsCollectionArrayOutput values. -// You can construct a concrete instance of `SubnetAllocationPoolsCollectionArrayInput` via: -// -// SubnetAllocationPoolsCollectionArray{ SubnetAllocationPoolsCollectionArgs{...} } -type SubnetAllocationPoolsCollectionArrayInput interface { - pulumi.Input - - ToSubnetAllocationPoolsCollectionArrayOutput() SubnetAllocationPoolsCollectionArrayOutput - ToSubnetAllocationPoolsCollectionArrayOutputWithContext(context.Context) SubnetAllocationPoolsCollectionArrayOutput -} - -type SubnetAllocationPoolsCollectionArray []SubnetAllocationPoolsCollectionInput - -func (SubnetAllocationPoolsCollectionArray) ElementType() reflect.Type { - return reflect.TypeOf((*[]SubnetAllocationPoolsCollection)(nil)).Elem() -} - -func (i SubnetAllocationPoolsCollectionArray) ToSubnetAllocationPoolsCollectionArrayOutput() SubnetAllocationPoolsCollectionArrayOutput { - return i.ToSubnetAllocationPoolsCollectionArrayOutputWithContext(context.Background()) -} - -func (i SubnetAllocationPoolsCollectionArray) ToSubnetAllocationPoolsCollectionArrayOutputWithContext(ctx context.Context) SubnetAllocationPoolsCollectionArrayOutput { - return pulumi.ToOutputWithContext(ctx, i).(SubnetAllocationPoolsCollectionArrayOutput) -} - -type SubnetAllocationPoolsCollectionOutput struct{ *pulumi.OutputState } - -func (SubnetAllocationPoolsCollectionOutput) ElementType() reflect.Type { - return reflect.TypeOf((*SubnetAllocationPoolsCollection)(nil)).Elem() -} - -func (o SubnetAllocationPoolsCollectionOutput) ToSubnetAllocationPoolsCollectionOutput() SubnetAllocationPoolsCollectionOutput { - return o -} - -func (o SubnetAllocationPoolsCollectionOutput) ToSubnetAllocationPoolsCollectionOutputWithContext(ctx context.Context) SubnetAllocationPoolsCollectionOutput { - return o -} - -// The ending address. -func (o SubnetAllocationPoolsCollectionOutput) End() pulumi.StringOutput { - return o.ApplyT(func(v SubnetAllocationPoolsCollection) string { return v.End }).(pulumi.StringOutput) -} - -// The starting address. -func (o SubnetAllocationPoolsCollectionOutput) Start() pulumi.StringOutput { - return o.ApplyT(func(v SubnetAllocationPoolsCollection) string { return v.Start }).(pulumi.StringOutput) -} - -type SubnetAllocationPoolsCollectionArrayOutput struct{ *pulumi.OutputState } - -func (SubnetAllocationPoolsCollectionArrayOutput) ElementType() reflect.Type { - return reflect.TypeOf((*[]SubnetAllocationPoolsCollection)(nil)).Elem() -} - -func (o SubnetAllocationPoolsCollectionArrayOutput) ToSubnetAllocationPoolsCollectionArrayOutput() SubnetAllocationPoolsCollectionArrayOutput { - return o -} - -func (o SubnetAllocationPoolsCollectionArrayOutput) ToSubnetAllocationPoolsCollectionArrayOutputWithContext(ctx context.Context) SubnetAllocationPoolsCollectionArrayOutput { - return o -} - -func (o SubnetAllocationPoolsCollectionArrayOutput) Index(i pulumi.IntInput) SubnetAllocationPoolsCollectionOutput { - return pulumi.All(o, i).ApplyT(func(vs []interface{}) SubnetAllocationPoolsCollection { - return vs[0].([]SubnetAllocationPoolsCollection)[vs[1].(int)] - }).(SubnetAllocationPoolsCollectionOutput) -} - -type SubnetHostRoute struct { - // The destination CIDR. - DestinationCidr string `pulumi:"destinationCidr"` - // The next hop in the route. - NextHop string `pulumi:"nextHop"` -} - -// SubnetHostRouteInput is an input type that accepts SubnetHostRouteArgs and SubnetHostRouteOutput values. -// You can construct a concrete instance of `SubnetHostRouteInput` via: -// -// SubnetHostRouteArgs{...} -type SubnetHostRouteInput interface { - pulumi.Input - - ToSubnetHostRouteOutput() SubnetHostRouteOutput - ToSubnetHostRouteOutputWithContext(context.Context) SubnetHostRouteOutput -} - -type SubnetHostRouteArgs struct { - // The destination CIDR. - DestinationCidr pulumi.StringInput `pulumi:"destinationCidr"` - // The next hop in the route. - NextHop pulumi.StringInput `pulumi:"nextHop"` -} - -func (SubnetHostRouteArgs) ElementType() reflect.Type { - return reflect.TypeOf((*SubnetHostRoute)(nil)).Elem() -} - -func (i SubnetHostRouteArgs) ToSubnetHostRouteOutput() SubnetHostRouteOutput { - return i.ToSubnetHostRouteOutputWithContext(context.Background()) -} - -func (i SubnetHostRouteArgs) ToSubnetHostRouteOutputWithContext(ctx context.Context) SubnetHostRouteOutput { - return pulumi.ToOutputWithContext(ctx, i).(SubnetHostRouteOutput) -} - -// SubnetHostRouteArrayInput is an input type that accepts SubnetHostRouteArray and SubnetHostRouteArrayOutput values. -// You can construct a concrete instance of `SubnetHostRouteArrayInput` via: -// -// SubnetHostRouteArray{ SubnetHostRouteArgs{...} } -type SubnetHostRouteArrayInput interface { - pulumi.Input - - ToSubnetHostRouteArrayOutput() SubnetHostRouteArrayOutput - ToSubnetHostRouteArrayOutputWithContext(context.Context) SubnetHostRouteArrayOutput -} - -type SubnetHostRouteArray []SubnetHostRouteInput - -func (SubnetHostRouteArray) ElementType() reflect.Type { - return reflect.TypeOf((*[]SubnetHostRoute)(nil)).Elem() -} - -func (i SubnetHostRouteArray) ToSubnetHostRouteArrayOutput() SubnetHostRouteArrayOutput { - return i.ToSubnetHostRouteArrayOutputWithContext(context.Background()) -} - -func (i SubnetHostRouteArray) ToSubnetHostRouteArrayOutputWithContext(ctx context.Context) SubnetHostRouteArrayOutput { - return pulumi.ToOutputWithContext(ctx, i).(SubnetHostRouteArrayOutput) -} - -type SubnetHostRouteOutput struct{ *pulumi.OutputState } - -func (SubnetHostRouteOutput) ElementType() reflect.Type { - return reflect.TypeOf((*SubnetHostRoute)(nil)).Elem() -} - -func (o SubnetHostRouteOutput) ToSubnetHostRouteOutput() SubnetHostRouteOutput { - return o -} - -func (o SubnetHostRouteOutput) ToSubnetHostRouteOutputWithContext(ctx context.Context) SubnetHostRouteOutput { - return o -} - -// The destination CIDR. -func (o SubnetHostRouteOutput) DestinationCidr() pulumi.StringOutput { - return o.ApplyT(func(v SubnetHostRoute) string { return v.DestinationCidr }).(pulumi.StringOutput) -} - -// The next hop in the route. -func (o SubnetHostRouteOutput) NextHop() pulumi.StringOutput { - return o.ApplyT(func(v SubnetHostRoute) string { return v.NextHop }).(pulumi.StringOutput) -} - -type SubnetHostRouteArrayOutput struct{ *pulumi.OutputState } - -func (SubnetHostRouteArrayOutput) ElementType() reflect.Type { - return reflect.TypeOf((*[]SubnetHostRoute)(nil)).Elem() -} - -func (o SubnetHostRouteArrayOutput) ToSubnetHostRouteArrayOutput() SubnetHostRouteArrayOutput { - return o -} - -func (o SubnetHostRouteArrayOutput) ToSubnetHostRouteArrayOutputWithContext(ctx context.Context) SubnetHostRouteArrayOutput { - return o -} - -func (o SubnetHostRouteArrayOutput) Index(i pulumi.IntInput) SubnetHostRouteOutput { - return pulumi.All(o, i).ApplyT(func(vs []interface{}) SubnetHostRoute { - return vs[0].([]SubnetHostRoute)[vs[1].(int)] - }).(SubnetHostRouteOutput) -} - type TrunkSubPort struct { // The ID of the port to be made a subport of the trunk. PortId string `pulumi:"portId"` @@ -2280,10 +2068,6 @@ func init() { pulumi.RegisterInputType(reflect.TypeOf((*RouterVendorOptionsPtrInput)(nil)).Elem(), RouterVendorOptionsArgs{}) pulumi.RegisterInputType(reflect.TypeOf((*SubnetAllocationPoolInput)(nil)).Elem(), SubnetAllocationPoolArgs{}) pulumi.RegisterInputType(reflect.TypeOf((*SubnetAllocationPoolArrayInput)(nil)).Elem(), SubnetAllocationPoolArray{}) - pulumi.RegisterInputType(reflect.TypeOf((*SubnetAllocationPoolsCollectionInput)(nil)).Elem(), SubnetAllocationPoolsCollectionArgs{}) - pulumi.RegisterInputType(reflect.TypeOf((*SubnetAllocationPoolsCollectionArrayInput)(nil)).Elem(), SubnetAllocationPoolsCollectionArray{}) - pulumi.RegisterInputType(reflect.TypeOf((*SubnetHostRouteInput)(nil)).Elem(), SubnetHostRouteArgs{}) - pulumi.RegisterInputType(reflect.TypeOf((*SubnetHostRouteArrayInput)(nil)).Elem(), SubnetHostRouteArray{}) pulumi.RegisterInputType(reflect.TypeOf((*TrunkSubPortInput)(nil)).Elem(), TrunkSubPortArgs{}) pulumi.RegisterInputType(reflect.TypeOf((*TrunkSubPortArrayInput)(nil)).Elem(), TrunkSubPortArray{}) pulumi.RegisterInputType(reflect.TypeOf((*GetNetworkSegmentInput)(nil)).Elem(), GetNetworkSegmentArgs{}) @@ -2318,10 +2102,6 @@ func init() { pulumi.RegisterOutputType(RouterVendorOptionsPtrOutput{}) pulumi.RegisterOutputType(SubnetAllocationPoolOutput{}) pulumi.RegisterOutputType(SubnetAllocationPoolArrayOutput{}) - pulumi.RegisterOutputType(SubnetAllocationPoolsCollectionOutput{}) - pulumi.RegisterOutputType(SubnetAllocationPoolsCollectionArrayOutput{}) - pulumi.RegisterOutputType(SubnetHostRouteOutput{}) - pulumi.RegisterOutputType(SubnetHostRouteArrayOutput{}) pulumi.RegisterOutputType(TrunkSubPortOutput{}) pulumi.RegisterOutputType(TrunkSubPortArrayOutput{}) pulumi.RegisterOutputType(GetNetworkSegmentOutput{}) diff --git a/sdk/go/openstack/networking/qosBandwidthLimitRule.go b/sdk/go/openstack/networking/qosBandwidthLimitRule.go index d1aa9c40a..0c738338b 100644 --- a/sdk/go/openstack/networking/qosBandwidthLimitRule.go +++ b/sdk/go/openstack/networking/qosBandwidthLimitRule.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/qosDscpMarkingRule.go b/sdk/go/openstack/networking/qosDscpMarkingRule.go index 15e5456ca..76479d09c 100644 --- a/sdk/go/openstack/networking/qosDscpMarkingRule.go +++ b/sdk/go/openstack/networking/qosDscpMarkingRule.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/qosMinimumBandwidthRule.go b/sdk/go/openstack/networking/qosMinimumBandwidthRule.go index c141b26db..575d8bcc4 100644 --- a/sdk/go/openstack/networking/qosMinimumBandwidthRule.go +++ b/sdk/go/openstack/networking/qosMinimumBandwidthRule.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/qosPolicy.go b/sdk/go/openstack/networking/qosPolicy.go index ce39c705f..1f65d4258 100644 --- a/sdk/go/openstack/networking/qosPolicy.go +++ b/sdk/go/openstack/networking/qosPolicy.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/quotaV2.go b/sdk/go/openstack/networking/quotaV2.go index 1c3447a8a..92f11b632 100644 --- a/sdk/go/openstack/networking/quotaV2.go +++ b/sdk/go/openstack/networking/quotaV2.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/networking/rbacPolicyV2.go b/sdk/go/openstack/networking/rbacPolicyV2.go index cbf51b835..535cf0650 100644 --- a/sdk/go/openstack/networking/rbacPolicyV2.go +++ b/sdk/go/openstack/networking/rbacPolicyV2.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -33,7 +33,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/router.go b/sdk/go/openstack/networking/router.go index 9489b4f6e..0b9c798b7 100644 --- a/sdk/go/openstack/networking/router.go +++ b/sdk/go/openstack/networking/router.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -80,14 +80,6 @@ type Router struct { // has to be set in order to set this property. Changing this updates the // external fixed IPs of the router. ExternalFixedIps RouterExternalFixedIpArrayOutput `pulumi:"externalFixedIps"` - // The - // network UUID of an external gateway for the router. A router with an - // external gateway is required if any compute instances or load balancers - // will be using floating IPs. Changing this updates the external gateway - // of an existing router. - // - // Deprecated: use externalNetworkId instead - ExternalGateway pulumi.StringOutput `pulumi:"externalGateway"` // The network UUID of an external gateway // for the router. A router with an external gateway is required if any // compute instances or load balancers will be using floating IPs. Changing @@ -178,14 +170,6 @@ type routerState struct { // has to be set in order to set this property. Changing this updates the // external fixed IPs of the router. ExternalFixedIps []RouterExternalFixedIp `pulumi:"externalFixedIps"` - // The - // network UUID of an external gateway for the router. A router with an - // external gateway is required if any compute instances or load balancers - // will be using floating IPs. Changing this updates the external gateway - // of an existing router. - // - // Deprecated: use externalNetworkId instead - ExternalGateway *string `pulumi:"externalGateway"` // The network UUID of an external gateway // for the router. A router with an external gateway is required if any // compute instances or load balancers will be using floating IPs. Changing @@ -247,14 +231,6 @@ type RouterState struct { // has to be set in order to set this property. Changing this updates the // external fixed IPs of the router. ExternalFixedIps RouterExternalFixedIpArrayInput - // The - // network UUID of an external gateway for the router. A router with an - // external gateway is required if any compute instances or load balancers - // will be using floating IPs. Changing this updates the external gateway - // of an existing router. - // - // Deprecated: use externalNetworkId instead - ExternalGateway pulumi.StringPtrInput // The network UUID of an external gateway // for the router. A router with an external gateway is required if any // compute instances or load balancers will be using floating IPs. Changing @@ -317,14 +293,6 @@ type routerArgs struct { // has to be set in order to set this property. Changing this updates the // external fixed IPs of the router. ExternalFixedIps []RouterExternalFixedIp `pulumi:"externalFixedIps"` - // The - // network UUID of an external gateway for the router. A router with an - // external gateway is required if any compute instances or load balancers - // will be using floating IPs. Changing this updates the external gateway - // of an existing router. - // - // Deprecated: use externalNetworkId instead - ExternalGateway *string `pulumi:"externalGateway"` // The network UUID of an external gateway // for the router. A router with an external gateway is required if any // compute instances or load balancers will be using floating IPs. Changing @@ -384,14 +352,6 @@ type RouterArgs struct { // has to be set in order to set this property. Changing this updates the // external fixed IPs of the router. ExternalFixedIps RouterExternalFixedIpArrayInput - // The - // network UUID of an external gateway for the router. A router with an - // external gateway is required if any compute instances or load balancers - // will be using floating IPs. Changing this updates the external gateway - // of an existing router. - // - // Deprecated: use externalNetworkId instead - ExternalGateway pulumi.StringPtrInput // The network UUID of an external gateway // for the router. A router with an external gateway is required if any // compute instances or load balancers will be using floating IPs. Changing @@ -560,17 +520,6 @@ func (o RouterOutput) ExternalFixedIps() RouterExternalFixedIpArrayOutput { return o.ApplyT(func(v *Router) RouterExternalFixedIpArrayOutput { return v.ExternalFixedIps }).(RouterExternalFixedIpArrayOutput) } -// The -// network UUID of an external gateway for the router. A router with an -// external gateway is required if any compute instances or load balancers -// will be using floating IPs. Changing this updates the external gateway -// of an existing router. -// -// Deprecated: use externalNetworkId instead -func (o RouterOutput) ExternalGateway() pulumi.StringOutput { - return o.ApplyT(func(v *Router) pulumi.StringOutput { return v.ExternalGateway }).(pulumi.StringOutput) -} - // The network UUID of an external gateway // for the router. A router with an external gateway is required if any // compute instances or load balancers will be using floating IPs. Changing diff --git a/sdk/go/openstack/networking/routerInterface.go b/sdk/go/openstack/networking/routerInterface.go index 6305fb532..272fe482a 100644 --- a/sdk/go/openstack/networking/routerInterface.go +++ b/sdk/go/openstack/networking/routerInterface.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/routerRoute.go b/sdk/go/openstack/networking/routerRoute.go index aeae2ef91..dd418e9be 100644 --- a/sdk/go/openstack/networking/routerRoute.go +++ b/sdk/go/openstack/networking/routerRoute.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/secGroup.go b/sdk/go/openstack/networking/secGroup.go index bb97e43f0..c9f125847 100644 --- a/sdk/go/openstack/networking/secGroup.go +++ b/sdk/go/openstack/networking/secGroup.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/networking/secGroupRule.go b/sdk/go/openstack/networking/secGroupRule.go index 73012ac37..8767d26ae 100644 --- a/sdk/go/openstack/networking/secGroupRule.go +++ b/sdk/go/openstack/networking/secGroupRule.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/subnet.go b/sdk/go/openstack/networking/subnet.go index 47399455e..8047f4df8 100644 --- a/sdk/go/openstack/networking/subnet.go +++ b/sdk/go/openstack/networking/subnet.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -68,12 +68,6 @@ type Subnet struct { // must be from the same CIDR that the subnet is part of. // The `allocationPool` block is documented below. AllocationPools SubnetAllocationPoolArrayOutput `pulumi:"allocationPools"` - // A block declaring the start and end range of the IP addresses available for - // use with DHCP in this subnet. - // The `allocationPools` block is documented below. - // - // Deprecated: use allocationPool instead - AllocationPoolsCollection SubnetAllocationPoolsCollectionArrayOutput `pulumi:"allocationPoolsCollection"` // CIDR representing IP range for this subnet, based on IP // version. You can omit this option if you are creating a subnet from a // subnet pool. @@ -94,14 +88,6 @@ type Subnet struct { // gateway of `.1` to be used. Changing this updates the gateway IP of the // existing subnet. GatewayIp pulumi.StringOutput `pulumi:"gatewayIp"` - // (**Deprecated** - use `networking.SubnetRoute` - // instead) An array of routes that should be used by devices - // with IPs from this subnet (not including local subnet route). The hostRoute - // object structure is documented below. Changing this updates the host routes - // for the existing subnet. - // - // Deprecated: Use networking.SubnetRoute instead - HostRoutes SubnetHostRouteArrayOutput `pulumi:"hostRoutes"` // IP version, either 4 (default) or 6. Changing this creates a // new subnet. IpVersion pulumi.IntPtrOutput `pulumi:"ipVersion"` @@ -187,12 +173,6 @@ type subnetState struct { // must be from the same CIDR that the subnet is part of. // The `allocationPool` block is documented below. AllocationPools []SubnetAllocationPool `pulumi:"allocationPools"` - // A block declaring the start and end range of the IP addresses available for - // use with DHCP in this subnet. - // The `allocationPools` block is documented below. - // - // Deprecated: use allocationPool instead - AllocationPoolsCollection []SubnetAllocationPoolsCollection `pulumi:"allocationPoolsCollection"` // CIDR representing IP range for this subnet, based on IP // version. You can omit this option if you are creating a subnet from a // subnet pool. @@ -213,14 +193,6 @@ type subnetState struct { // gateway of `.1` to be used. Changing this updates the gateway IP of the // existing subnet. GatewayIp *string `pulumi:"gatewayIp"` - // (**Deprecated** - use `networking.SubnetRoute` - // instead) An array of routes that should be used by devices - // with IPs from this subnet (not including local subnet route). The hostRoute - // object structure is documented below. Changing this updates the host routes - // for the existing subnet. - // - // Deprecated: Use networking.SubnetRoute instead - HostRoutes []SubnetHostRoute `pulumi:"hostRoutes"` // IP version, either 4 (default) or 6. Changing this creates a // new subnet. IpVersion *int `pulumi:"ipVersion"` @@ -274,12 +246,6 @@ type SubnetState struct { // must be from the same CIDR that the subnet is part of. // The `allocationPool` block is documented below. AllocationPools SubnetAllocationPoolArrayInput - // A block declaring the start and end range of the IP addresses available for - // use with DHCP in this subnet. - // The `allocationPools` block is documented below. - // - // Deprecated: use allocationPool instead - AllocationPoolsCollection SubnetAllocationPoolsCollectionArrayInput // CIDR representing IP range for this subnet, based on IP // version. You can omit this option if you are creating a subnet from a // subnet pool. @@ -300,14 +266,6 @@ type SubnetState struct { // gateway of `.1` to be used. Changing this updates the gateway IP of the // existing subnet. GatewayIp pulumi.StringPtrInput - // (**Deprecated** - use `networking.SubnetRoute` - // instead) An array of routes that should be used by devices - // with IPs from this subnet (not including local subnet route). The hostRoute - // object structure is documented below. Changing this updates the host routes - // for the existing subnet. - // - // Deprecated: Use networking.SubnetRoute instead - HostRoutes SubnetHostRouteArrayInput // IP version, either 4 (default) or 6. Changing this creates a // new subnet. IpVersion pulumi.IntPtrInput @@ -362,12 +320,6 @@ type subnetArgs struct { // must be from the same CIDR that the subnet is part of. // The `allocationPool` block is documented below. AllocationPools []SubnetAllocationPool `pulumi:"allocationPools"` - // A block declaring the start and end range of the IP addresses available for - // use with DHCP in this subnet. - // The `allocationPools` block is documented below. - // - // Deprecated: use allocationPool instead - AllocationPoolsCollection []SubnetAllocationPoolsCollection `pulumi:"allocationPoolsCollection"` // CIDR representing IP range for this subnet, based on IP // version. You can omit this option if you are creating a subnet from a // subnet pool. @@ -388,14 +340,6 @@ type subnetArgs struct { // gateway of `.1` to be used. Changing this updates the gateway IP of the // existing subnet. GatewayIp *string `pulumi:"gatewayIp"` - // (**Deprecated** - use `networking.SubnetRoute` - // instead) An array of routes that should be used by devices - // with IPs from this subnet (not including local subnet route). The hostRoute - // object structure is documented below. Changing this updates the host routes - // for the existing subnet. - // - // Deprecated: Use networking.SubnetRoute instead - HostRoutes []SubnetHostRoute `pulumi:"hostRoutes"` // IP version, either 4 (default) or 6. Changing this creates a // new subnet. IpVersion *int `pulumi:"ipVersion"` @@ -447,12 +391,6 @@ type SubnetArgs struct { // must be from the same CIDR that the subnet is part of. // The `allocationPool` block is documented below. AllocationPools SubnetAllocationPoolArrayInput - // A block declaring the start and end range of the IP addresses available for - // use with DHCP in this subnet. - // The `allocationPools` block is documented below. - // - // Deprecated: use allocationPool instead - AllocationPoolsCollection SubnetAllocationPoolsCollectionArrayInput // CIDR representing IP range for this subnet, based on IP // version. You can omit this option if you are creating a subnet from a // subnet pool. @@ -473,14 +411,6 @@ type SubnetArgs struct { // gateway of `.1` to be used. Changing this updates the gateway IP of the // existing subnet. GatewayIp pulumi.StringPtrInput - // (**Deprecated** - use `networking.SubnetRoute` - // instead) An array of routes that should be used by devices - // with IPs from this subnet (not including local subnet route). The hostRoute - // object structure is documented below. Changing this updates the host routes - // for the existing subnet. - // - // Deprecated: Use networking.SubnetRoute instead - HostRoutes SubnetHostRouteArrayInput // IP version, either 4 (default) or 6. Changing this creates a // new subnet. IpVersion pulumi.IntPtrInput @@ -626,15 +556,6 @@ func (o SubnetOutput) AllocationPools() SubnetAllocationPoolArrayOutput { return o.ApplyT(func(v *Subnet) SubnetAllocationPoolArrayOutput { return v.AllocationPools }).(SubnetAllocationPoolArrayOutput) } -// A block declaring the start and end range of the IP addresses available for -// use with DHCP in this subnet. -// The `allocationPools` block is documented below. -// -// Deprecated: use allocationPool instead -func (o SubnetOutput) AllocationPoolsCollection() SubnetAllocationPoolsCollectionArrayOutput { - return o.ApplyT(func(v *Subnet) SubnetAllocationPoolsCollectionArrayOutput { return v.AllocationPoolsCollection }).(SubnetAllocationPoolsCollectionArrayOutput) -} - // CIDR representing IP range for this subnet, based on IP // version. You can omit this option if you are creating a subnet from a // subnet pool. @@ -670,17 +591,6 @@ func (o SubnetOutput) GatewayIp() pulumi.StringOutput { return o.ApplyT(func(v *Subnet) pulumi.StringOutput { return v.GatewayIp }).(pulumi.StringOutput) } -// (**Deprecated** - use `networking.SubnetRoute` -// instead) An array of routes that should be used by devices -// with IPs from this subnet (not including local subnet route). The hostRoute -// object structure is documented below. Changing this updates the host routes -// for the existing subnet. -// -// Deprecated: Use networking.SubnetRoute instead -func (o SubnetOutput) HostRoutes() SubnetHostRouteArrayOutput { - return o.ApplyT(func(v *Subnet) SubnetHostRouteArrayOutput { return v.HostRoutes }).(SubnetHostRouteArrayOutput) -} - // IP version, either 4 (default) or 6. Changing this creates a // new subnet. func (o SubnetOutput) IpVersion() pulumi.IntPtrOutput { diff --git a/sdk/go/openstack/networking/subnetPool.go b/sdk/go/openstack/networking/subnetPool.go index 6e1d5fdca..e223f7075 100644 --- a/sdk/go/openstack/networking/subnetPool.go +++ b/sdk/go/openstack/networking/subnetPool.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -54,7 +54,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/subnetRoute.go b/sdk/go/openstack/networking/subnetRoute.go index b5ce2643d..6b841053b 100644 --- a/sdk/go/openstack/networking/subnetRoute.go +++ b/sdk/go/openstack/networking/subnetRoute.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/networking/trunk.go b/sdk/go/openstack/networking/trunk.go index 4135d42b1..de71213fb 100644 --- a/sdk/go/openstack/networking/trunk.go +++ b/sdk/go/openstack/networking/trunk.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,8 +21,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/compute" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/objectstorage/container.go b/sdk/go/openstack/objectstorage/container.go index 4064957aa..1651b7c5a 100644 --- a/sdk/go/openstack/objectstorage/container.go +++ b/sdk/go/openstack/objectstorage/container.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -22,7 +22,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/objectstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/objectstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -54,7 +54,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/objectstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/objectstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -89,7 +89,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/objectstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/objectstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -118,7 +118,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/objectstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/objectstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -149,8 +149,8 @@ import ( // // "fmt" // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/identity" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/objectstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/identity" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/objectstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/objectstorage/containerObject.go b/sdk/go/openstack/objectstorage/containerObject.go index 8605bd747..c1fc31674 100644 --- a/sdk/go/openstack/objectstorage/containerObject.go +++ b/sdk/go/openstack/objectstorage/containerObject.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -23,7 +23,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/objectstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/objectstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -71,7 +71,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/objectstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/objectstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/objectstorage/init.go b/sdk/go/openstack/objectstorage/init.go index 441885dc8..ba483288f 100644 --- a/sdk/go/openstack/objectstorage/init.go +++ b/sdk/go/openstack/objectstorage/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/objectstorage/pulumiTypes.go b/sdk/go/openstack/objectstorage/pulumiTypes.go index 1e3db9440..28710fbdf 100644 --- a/sdk/go/openstack/objectstorage/pulumiTypes.go +++ b/sdk/go/openstack/objectstorage/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/objectstorage/tempUrl.go b/sdk/go/openstack/objectstorage/tempUrl.go index f888ba706..0fd97c24f 100644 --- a/sdk/go/openstack/objectstorage/tempUrl.go +++ b/sdk/go/openstack/objectstorage/tempUrl.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -27,7 +27,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/objectstorage" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/objectstorage" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/orchestration/init.go b/sdk/go/openstack/orchestration/init.go index b4717e9d0..eb8e2abe8 100644 --- a/sdk/go/openstack/orchestration/init.go +++ b/sdk/go/openstack/orchestration/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/orchestration/pulumiTypes.go b/sdk/go/openstack/orchestration/pulumiTypes.go index 4f18fd922..8b6a830ad 100644 --- a/sdk/go/openstack/orchestration/pulumiTypes.go +++ b/sdk/go/openstack/orchestration/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/orchestration/stackV1.go b/sdk/go/openstack/orchestration/stackV1.go index 19abe1908..a5ccb316c 100644 --- a/sdk/go/openstack/orchestration/stackV1.go +++ b/sdk/go/openstack/orchestration/stackV1.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/orchestration" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/orchestration" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/provider.go b/sdk/go/openstack/provider.go index 80ab5ad84..ff5a65893 100644 --- a/sdk/go/openstack/provider.go +++ b/sdk/go/openstack/provider.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -107,11 +107,6 @@ func NewProvider(ctx *pulumi.Context, args.Swauth = pulumi.BoolPtr(d.(bool)) } } - if args.UseOctavia == nil { - if d := internal.GetEnvOrDefault(nil, internal.ParseEnvBool, "OS_USE_OCTAVIA"); d != nil { - args.UseOctavia = pulumi.BoolPtr(d.(bool)) - } - } if args.Password != nil { args.Password = pulumi.ToSecret(args.Password).(pulumi.StringPtrInput) } @@ -186,10 +181,6 @@ type providerArgs struct { TenantName *string `pulumi:"tenantName"` // Authentication token to use as an alternative to username/password. Token *string `pulumi:"token"` - // If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron). - // - // Deprecated: Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. - UseOctavia *bool `pulumi:"useOctavia"` // The ID of the domain where the user resides (Identity v3). UserDomainId *string `pulumi:"userDomainId"` // The name of the domain where the user resides (Identity v3). @@ -259,10 +250,6 @@ type ProviderArgs struct { TenantName pulumi.StringPtrInput // Authentication token to use as an alternative to username/password. Token pulumi.StringPtrInput - // If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron). - // - // Deprecated: Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. - UseOctavia pulumi.BoolPtrInput // The ID of the domain where the user resides (Identity v3). UserDomainId pulumi.StringPtrInput // The name of the domain where the user resides (Identity v3). diff --git a/sdk/go/openstack/pulumi-plugin.json b/sdk/go/openstack/pulumi-plugin.json index c2fd7376d..84f878f23 100644 --- a/sdk/go/openstack/pulumi-plugin.json +++ b/sdk/go/openstack/pulumi-plugin.json @@ -1,5 +1,5 @@ { "resource": true, "name": "openstack", - "version": "3.0.0-alpha.0+dev" + "version": "4.0.0-alpha.0+dev" } diff --git a/sdk/go/openstack/sharedfilesystem/getAvailbilityZones.go b/sdk/go/openstack/sharedfilesystem/getAvailbilityZones.go index 1e7991c2d..d551c3912 100644 --- a/sdk/go/openstack/sharedfilesystem/getAvailbilityZones.go +++ b/sdk/go/openstack/sharedfilesystem/getAvailbilityZones.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/sharedfilesystem" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/sharedfilesystem" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/sharedfilesystem/getShare.go b/sdk/go/openstack/sharedfilesystem/getShare.go index 3d9633388..cf2bfc4a9 100644 --- a/sdk/go/openstack/sharedfilesystem/getShare.go +++ b/sdk/go/openstack/sharedfilesystem/getShare.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/sharedfilesystem" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/sharedfilesystem" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/sharedfilesystem/getShareNetwork.go b/sdk/go/openstack/sharedfilesystem/getShareNetwork.go index 9a5a9885e..a6c8e81f1 100644 --- a/sdk/go/openstack/sharedfilesystem/getShareNetwork.go +++ b/sdk/go/openstack/sharedfilesystem/getShareNetwork.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/sharedfilesystem" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/sharedfilesystem" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/sharedfilesystem/getSnapshot.go b/sdk/go/openstack/sharedfilesystem/getSnapshot.go index a371118da..bdc35b2b1 100644 --- a/sdk/go/openstack/sharedfilesystem/getSnapshot.go +++ b/sdk/go/openstack/sharedfilesystem/getSnapshot.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/sharedfilesystem" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/sharedfilesystem" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/sharedfilesystem/init.go b/sdk/go/openstack/sharedfilesystem/init.go index 4ff2ce5f4..a5516ce46 100644 --- a/sdk/go/openstack/sharedfilesystem/init.go +++ b/sdk/go/openstack/sharedfilesystem/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/sharedfilesystem/pulumiTypes.go b/sdk/go/openstack/sharedfilesystem/pulumiTypes.go index 19a22cc70..ef1907eae 100644 --- a/sdk/go/openstack/sharedfilesystem/pulumiTypes.go +++ b/sdk/go/openstack/sharedfilesystem/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/sharedfilesystem/securityService.go b/sdk/go/openstack/sharedfilesystem/securityService.go index b2e7c2609..e0d3cedb0 100644 --- a/sdk/go/openstack/sharedfilesystem/securityService.go +++ b/sdk/go/openstack/sharedfilesystem/securityService.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -32,7 +32,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/sharedfilesystem" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/sharedfilesystem" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/sharedfilesystem/share.go b/sdk/go/openstack/sharedfilesystem/share.go index f31f13e02..11a99a037 100644 --- a/sdk/go/openstack/sharedfilesystem/share.go +++ b/sdk/go/openstack/sharedfilesystem/share.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,8 +21,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/sharedfilesystem" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/sharedfilesystem" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/sharedfilesystem/shareAccess.go b/sdk/go/openstack/sharedfilesystem/shareAccess.go index b0429d3f3..f8da849c9 100644 --- a/sdk/go/openstack/sharedfilesystem/shareAccess.go +++ b/sdk/go/openstack/sharedfilesystem/shareAccess.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,8 +21,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/sharedfilesystem" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/sharedfilesystem" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -86,8 +86,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/sharedfilesystem" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/sharedfilesystem" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/sharedfilesystem/shareNetwork.go b/sdk/go/openstack/sharedfilesystem/shareNetwork.go index ec05ece3b..be8480cd6 100644 --- a/sdk/go/openstack/sharedfilesystem/shareNetwork.go +++ b/sdk/go/openstack/sharedfilesystem/shareNetwork.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -26,8 +26,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/sharedfilesystem" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/sharedfilesystem" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -72,8 +72,8 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/networking" -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/sharedfilesystem" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/networking" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/sharedfilesystem" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/vpnaas/endpointGroup.go b/sdk/go/openstack/vpnaas/endpointGroup.go index 5fb975965..2059a58b1 100644 --- a/sdk/go/openstack/vpnaas/endpointGroup.go +++ b/sdk/go/openstack/vpnaas/endpointGroup.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/vpnaas" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/vpnaas" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/vpnaas/ikePolicy.go b/sdk/go/openstack/vpnaas/ikePolicy.go index 2b2b3d667..98702c88a 100644 --- a/sdk/go/openstack/vpnaas/ikePolicy.go +++ b/sdk/go/openstack/vpnaas/ikePolicy.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/vpnaas" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/vpnaas" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) @@ -58,7 +58,7 @@ type IkePolicy struct { // The encryption algorithm. Valid values are 3des, aes-128, aes-192 and so on. // The default value is aes-128. Changing this updates the existing policy. EncryptionAlgorithm pulumi.StringPtrOutput `pulumi:"encryptionAlgorithm"` - // The IKE mode. A valid value is v1 or v2. Default is v1. + // The IKE version. A valid value is v1 or v2. Default is v1. // Changing this updates the existing policy. IkeVersion pulumi.StringPtrOutput `pulumi:"ikeVersion"` // The lifetime of the security association. Consists of Unit and Value. @@ -123,7 +123,7 @@ type ikePolicyState struct { // The encryption algorithm. Valid values are 3des, aes-128, aes-192 and so on. // The default value is aes-128. Changing this updates the existing policy. EncryptionAlgorithm *string `pulumi:"encryptionAlgorithm"` - // The IKE mode. A valid value is v1 or v2. Default is v1. + // The IKE version. A valid value is v1 or v2. Default is v1. // Changing this updates the existing policy. IkeVersion *string `pulumi:"ikeVersion"` // The lifetime of the security association. Consists of Unit and Value. @@ -159,7 +159,7 @@ type IkePolicyState struct { // The encryption algorithm. Valid values are 3des, aes-128, aes-192 and so on. // The default value is aes-128. Changing this updates the existing policy. EncryptionAlgorithm pulumi.StringPtrInput - // The IKE mode. A valid value is v1 or v2. Default is v1. + // The IKE version. A valid value is v1 or v2. Default is v1. // Changing this updates the existing policy. IkeVersion pulumi.StringPtrInput // The lifetime of the security association. Consists of Unit and Value. @@ -199,7 +199,7 @@ type ikePolicyArgs struct { // The encryption algorithm. Valid values are 3des, aes-128, aes-192 and so on. // The default value is aes-128. Changing this updates the existing policy. EncryptionAlgorithm *string `pulumi:"encryptionAlgorithm"` - // The IKE mode. A valid value is v1 or v2. Default is v1. + // The IKE version. A valid value is v1 or v2. Default is v1. // Changing this updates the existing policy. IkeVersion *string `pulumi:"ikeVersion"` // The lifetime of the security association. Consists of Unit and Value. @@ -236,7 +236,7 @@ type IkePolicyArgs struct { // The encryption algorithm. Valid values are 3des, aes-128, aes-192 and so on. // The default value is aes-128. Changing this updates the existing policy. EncryptionAlgorithm pulumi.StringPtrInput - // The IKE mode. A valid value is v1 or v2. Default is v1. + // The IKE version. A valid value is v1 or v2. Default is v1. // Changing this updates the existing policy. IkeVersion pulumi.StringPtrInput // The lifetime of the security association. Consists of Unit and Value. @@ -367,7 +367,7 @@ func (o IkePolicyOutput) EncryptionAlgorithm() pulumi.StringPtrOutput { return o.ApplyT(func(v *IkePolicy) pulumi.StringPtrOutput { return v.EncryptionAlgorithm }).(pulumi.StringPtrOutput) } -// The IKE mode. A valid value is v1 or v2. Default is v1. +// The IKE version. A valid value is v1 or v2. Default is v1. // Changing this updates the existing policy. func (o IkePolicyOutput) IkeVersion() pulumi.StringPtrOutput { return o.ApplyT(func(v *IkePolicy) pulumi.StringPtrOutput { return v.IkeVersion }).(pulumi.StringPtrOutput) diff --git a/sdk/go/openstack/vpnaas/init.go b/sdk/go/openstack/vpnaas/init.go index ddb75f3e8..87d3078c2 100644 --- a/sdk/go/openstack/vpnaas/init.go +++ b/sdk/go/openstack/vpnaas/init.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/blang/semver" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/vpnaas/ipSecPolicy.go b/sdk/go/openstack/vpnaas/ipSecPolicy.go index d99b2df65..c957205ed 100644 --- a/sdk/go/openstack/vpnaas/ipSecPolicy.go +++ b/sdk/go/openstack/vpnaas/ipSecPolicy.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -20,7 +20,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/vpnaas" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/vpnaas" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/vpnaas/pulumiTypes.go b/sdk/go/openstack/vpnaas/pulumiTypes.go index 4cf6a1a0d..fe8a40f45 100644 --- a/sdk/go/openstack/vpnaas/pulumiTypes.go +++ b/sdk/go/openstack/vpnaas/pulumiTypes.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/openstack/vpnaas/service.go b/sdk/go/openstack/vpnaas/service.go index 320fea566..db8ad69c2 100644 --- a/sdk/go/openstack/vpnaas/service.go +++ b/sdk/go/openstack/vpnaas/service.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/vpnaas" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/vpnaas" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/go/openstack/vpnaas/siteConnection.go b/sdk/go/openstack/vpnaas/siteConnection.go index 6a88c205f..a754a2dd0 100644 --- a/sdk/go/openstack/vpnaas/siteConnection.go +++ b/sdk/go/openstack/vpnaas/siteConnection.go @@ -8,7 +8,7 @@ import ( "reflect" "errors" - "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/internal" + "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/internal" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) @@ -21,7 +21,7 @@ import ( // // import ( // -// "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/vpnaas" +// "github.com/pulumi/pulumi-openstack/sdk/v4/go/openstack/vpnaas" // "github.com/pulumi/pulumi/sdk/v3/go/pulumi" // // ) diff --git a/sdk/java/src/main/java/com/pulumi/openstack/Config.java b/sdk/java/src/main/java/com/pulumi/openstack/Config.java index be640cb6a..848853a58 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/Config.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/Config.java @@ -209,13 +209,6 @@ public Optional tenantName() { public Optional token() { return Codegen.stringProp("token").config(config).get(); } -/** - * If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron). - * - */ - public Optional useOctavia() { - return Codegen.booleanProp("useOctavia").config(config).env("OS_USE_OCTAVIA").get(); - } /** * The ID of the domain where the user resides (Identity v3). * diff --git a/sdk/java/src/main/java/com/pulumi/openstack/ProviderArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/ProviderArgs.java index 73bd5bd81..25968f6cf 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/ProviderArgs.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/ProviderArgs.java @@ -436,29 +436,6 @@ public Optional> token() { return Optional.ofNullable(this.token); } - /** - * If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron). - * - * @deprecated - * Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. - * - */ - @Deprecated /* Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. */ - @Import(name="useOctavia", json=true) - private @Nullable Output useOctavia; - - /** - * @return If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron). - * - * @deprecated - * Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. - * - */ - @Deprecated /* Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. */ - public Optional> useOctavia() { - return Optional.ofNullable(this.useOctavia); - } - /** * The ID of the domain where the user resides (Identity v3). * @@ -550,7 +527,6 @@ private ProviderArgs(ProviderArgs $) { this.tenantId = $.tenantId; this.tenantName = $.tenantName; this.token = $.token; - this.useOctavia = $.useOctavia; this.userDomainId = $.userDomainId; this.userDomainName = $.userDomainName; this.userId = $.userId; @@ -1155,35 +1131,6 @@ public Builder token(String token) { return token(Output.of(token)); } - /** - * @param useOctavia If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron). - * - * @return builder - * - * @deprecated - * Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. - * - */ - @Deprecated /* Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. */ - public Builder useOctavia(@Nullable Output useOctavia) { - $.useOctavia = useOctavia; - return this; - } - - /** - * @param useOctavia If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron). - * - * @return builder - * - * @deprecated - * Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. - * - */ - @Deprecated /* Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia. */ - public Builder useOctavia(Boolean useOctavia) { - return useOctavia(Output.of(useOctavia)); - } - /** * @param userDomainId The ID of the domain where the user resides (Identity v3). * @@ -1276,7 +1223,6 @@ public ProviderArgs build() { $.insecure = Codegen.booleanProp("insecure").output().arg($.insecure).env("OS_INSECURE").getNullable(); $.region = Codegen.stringProp("region").output().arg($.region).env("OS_REGION_NAME").getNullable(); $.swauth = Codegen.booleanProp("swauth").output().arg($.swauth).env("OS_SWAUTH").getNullable(); - $.useOctavia = Codegen.booleanProp("useOctavia").output().arg($.useOctavia).env("OS_USE_OCTAVIA").getNullable(); return $; } } diff --git a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/Volume.java b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/Volume.java index eeaafef2b..761ad5aca 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/Volume.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/Volume.java @@ -209,24 +209,6 @@ public Output> imageId() { public Output> metadata() { return this.metadata; } - /** - * (Optional) Allow the volume to be attached to more than one Compute instance. - * - * @deprecated - * multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - * - */ - @Deprecated /* multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types */ - @Export(name="multiattach", refs={Boolean.class}, tree="[0]") - private Output multiattach; - - /** - * @return (Optional) Allow the volume to be attached to more than one Compute instance. - * - */ - public Output> multiattach() { - return Codegen.optional(this.multiattach); - } /** * A unique name for the volume. Changing this updates the * volume's name. diff --git a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeArgs.java index 56d0150e7..391138b15 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeArgs.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeArgs.java @@ -147,29 +147,6 @@ public Optional>> metadata() { return Optional.ofNullable(this.metadata); } - /** - * (Optional) Allow the volume to be attached to more than one Compute instance. - * - * @deprecated - * multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - * - */ - @Deprecated /* multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types */ - @Import(name="multiattach") - private @Nullable Output multiattach; - - /** - * @return (Optional) Allow the volume to be attached to more than one Compute instance. - * - * @deprecated - * multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - * - */ - @Deprecated /* multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types */ - public Optional> multiattach() { - return Optional.ofNullable(this.multiattach); - } - /** * A unique name for the volume. Changing this updates the * volume's name. @@ -318,7 +295,6 @@ private VolumeArgs(VolumeArgs $) { this.enableOnlineResize = $.enableOnlineResize; this.imageId = $.imageId; this.metadata = $.metadata; - this.multiattach = $.multiattach; this.name = $.name; this.region = $.region; this.schedulerHints = $.schedulerHints; @@ -514,35 +490,6 @@ public Builder metadata(Map metadata) { return metadata(Output.of(metadata)); } - /** - * @param multiattach (Optional) Allow the volume to be attached to more than one Compute instance. - * - * @return builder - * - * @deprecated - * multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - * - */ - @Deprecated /* multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types */ - public Builder multiattach(@Nullable Output multiattach) { - $.multiattach = multiattach; - return this; - } - - /** - * @param multiattach (Optional) Allow the volume to be attached to more than one Compute instance. - * - * @return builder - * - * @deprecated - * multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - * - */ - @Deprecated /* multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types */ - public Builder multiattach(Boolean multiattach) { - return multiattach(Output.of(multiattach)); - } - /** * @param name A unique name for the volume. Changing this updates the * volume's name. diff --git a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeAttachV2.java b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeAttachV2.java index b0ce3db6b..7bd03916c 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeAttachV2.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeAttachV2.java @@ -204,18 +204,6 @@ public Output hostName() { public Output> initiator() { return Codegen.optional(this.initiator); } - /** - * @deprecated - * instance_id is no longer used in this resource - * - */ - @Deprecated /* instance_id is no longer used in this resource */ - @Export(name="instanceId", refs={String.class}, tree="[0]") - private Output instanceId; - - public Output> instanceId() { - return Codegen.optional(this.instanceId); - } /** * The IP address of the `host_name` above. * diff --git a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeAttachV2Args.java b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeAttachV2Args.java index fb14a827a..8bcb94df1 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeAttachV2Args.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeAttachV2Args.java @@ -86,25 +86,6 @@ public Optional> initiator() { return Optional.ofNullable(this.initiator); } - /** - * @deprecated - * instance_id is no longer used in this resource - * - */ - @Deprecated /* instance_id is no longer used in this resource */ - @Import(name="instanceId") - private @Nullable Output instanceId; - - /** - * @deprecated - * instance_id is no longer used in this resource - * - */ - @Deprecated /* instance_id is no longer used in this resource */ - public Optional> instanceId() { - return Optional.ofNullable(this.instanceId); - } - /** * The IP address of the `host_name` above. * @@ -240,7 +221,6 @@ private VolumeAttachV2Args(VolumeAttachV2Args $) { this.device = $.device; this.hostName = $.hostName; this.initiator = $.initiator; - this.instanceId = $.instanceId; this.ipAddress = $.ipAddress; this.multipath = $.multipath; this.osType = $.osType; @@ -361,31 +341,6 @@ public Builder initiator(String initiator) { return initiator(Output.of(initiator)); } - /** - * @return builder - * - * @deprecated - * instance_id is no longer used in this resource - * - */ - @Deprecated /* instance_id is no longer used in this resource */ - public Builder instanceId(@Nullable Output instanceId) { - $.instanceId = instanceId; - return this; - } - - /** - * @return builder - * - * @deprecated - * instance_id is no longer used in this resource - * - */ - @Deprecated /* instance_id is no longer used in this resource */ - public Builder instanceId(String instanceId) { - return instanceId(Output.of(instanceId)); - } - /** * @param ipAddress The IP address of the `host_name` above. * diff --git a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeTypeV3.java b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeTypeV3.java index 7fe0bc45b..8869c6f91 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeTypeV3.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/VolumeTypeV3.java @@ -23,6 +23,8 @@ * * ## Example Usage * + * ### Basic Volume Type + * * <!--Start PulumiCodeChooser --> * 
  * {@code
@@ -61,6 +63,43 @@
  *
* <!--End PulumiCodeChooser --> * + * ### Volume Type with multiattach enabled + * + * <!--Start PulumiCodeChooser --> + * 
+ * {@code
+ * package generated_program;
+ * 
+ * import com.pulumi.Context;
+ * import com.pulumi.Pulumi;
+ * import com.pulumi.core.Output;
+ * import com.pulumi.openstack.blockstorage.VolumeTypeV3;
+ * import com.pulumi.openstack.blockstorage.VolumeTypeV3Args;
+ * import java.util.List;
+ * import java.util.ArrayList;
+ * import java.util.Map;
+ * import java.io.File;
+ * import java.nio.file.Files;
+ * import java.nio.file.Paths;
+ * 
+ * public class App {
+ *     public static void main(String[] args) {
+ *         Pulumi.run(App::stack);
+ *     }
+ * 
+ *     public static void stack(Context ctx) {
+ *         var multiattach = new VolumeTypeV3("multiattach", VolumeTypeV3Args.builder()        
+ *             .name("multiattach")
+ *             .description("Multiattach-enabled volume type")
+ *             .extraSpecs(Map.of("multiattach", " True"))
+ *             .build());
+ * 
+ *     }
+ * }
+ * }
+ *
+ * <!--End PulumiCodeChooser --> + * * ## Import * * Volume types can be imported using the `volume_type_id`, e.g. diff --git a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/inputs/VolumeAttachV2State.java b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/inputs/VolumeAttachV2State.java index 7eff88137..8d4ddc9da 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/inputs/VolumeAttachV2State.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/inputs/VolumeAttachV2State.java @@ -121,25 +121,6 @@ public Optional> initiator() { return Optional.ofNullable(this.initiator); } - /** - * @deprecated - * instance_id is no longer used in this resource - * - */ - @Deprecated /* instance_id is no longer used in this resource */ - @Import(name="instanceId") - private @Nullable Output instanceId; - - /** - * @deprecated - * instance_id is no longer used in this resource - * - */ - @Deprecated /* instance_id is no longer used in this resource */ - public Optional> instanceId() { - return Optional.ofNullable(this.instanceId); - } - /** * The IP address of the `host_name` above. * @@ -292,7 +273,6 @@ private VolumeAttachV2State(VolumeAttachV2State $) { this.driverVolumeType = $.driverVolumeType; this.hostName = $.hostName; this.initiator = $.initiator; - this.instanceId = $.instanceId; this.ipAddress = $.ipAddress; this.mountPointBase = $.mountPointBase; this.multipath = $.multipath; @@ -460,31 +440,6 @@ public Builder initiator(String initiator) { return initiator(Output.of(initiator)); } - /** - * @return builder - * - * @deprecated - * instance_id is no longer used in this resource - * - */ - @Deprecated /* instance_id is no longer used in this resource */ - public Builder instanceId(@Nullable Output instanceId) { - $.instanceId = instanceId; - return this; - } - - /** - * @return builder - * - * @deprecated - * instance_id is no longer used in this resource - * - */ - @Deprecated /* instance_id is no longer used in this resource */ - public Builder instanceId(String instanceId) { - return instanceId(Output.of(instanceId)); - } - /** * @param ipAddress The IP address of the `host_name` above. * diff --git a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/inputs/VolumeState.java b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/inputs/VolumeState.java index 4b04a141d..0a400061d 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/inputs/VolumeState.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/inputs/VolumeState.java @@ -166,29 +166,6 @@ public Optional>> metadata() { return Optional.ofNullable(this.metadata); } - /** - * (Optional) Allow the volume to be attached to more than one Compute instance. - * - * @deprecated - * multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - * - */ - @Deprecated /* multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types */ - @Import(name="multiattach") - private @Nullable Output multiattach; - - /** - * @return (Optional) Allow the volume to be attached to more than one Compute instance. - * - * @deprecated - * multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - * - */ - @Deprecated /* multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types */ - public Optional> multiattach() { - return Optional.ofNullable(this.multiattach); - } - /** * A unique name for the volume. Changing this updates the * volume's name. @@ -338,7 +315,6 @@ private VolumeState(VolumeState $) { this.enableOnlineResize = $.enableOnlineResize; this.imageId = $.imageId; this.metadata = $.metadata; - this.multiattach = $.multiattach; this.name = $.name; this.region = $.region; this.schedulerHints = $.schedulerHints; @@ -571,35 +547,6 @@ public Builder metadata(Map metadata) { return metadata(Output.of(metadata)); } - /** - * @param multiattach (Optional) Allow the volume to be attached to more than one Compute instance. - * - * @return builder - * - * @deprecated - * multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - * - */ - @Deprecated /* multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types */ - public Builder multiattach(@Nullable Output multiattach) { - $.multiattach = multiattach; - return this; - } - - /** - * @param multiattach (Optional) Allow the volume to be attached to more than one Compute instance. - * - * @return builder - * - * @deprecated - * multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types - * - */ - @Deprecated /* multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types */ - public Builder multiattach(Boolean multiattach) { - return multiattach(Output.of(multiattach)); - } - /** * @param name A unique name for the volume. Changing this updates the * volume's name. diff --git a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/outputs/GetVolumeV3Result.java b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/outputs/GetVolumeV3Result.java index 24238cd62..2d198432c 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/outputs/GetVolumeV3Result.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/blockstorage/outputs/GetVolumeV3Result.java @@ -6,7 +6,6 @@ import com.pulumi.core.annotations.CustomType; import com.pulumi.exceptions.MissingRequiredPropertyException; import com.pulumi.openstack.blockstorage.outputs.GetVolumeV3Attachment; -import java.lang.Boolean; import java.lang.Integer; import java.lang.Object; import java.lang.String; @@ -43,11 +42,6 @@ public final class GetVolumeV3Result { * */ private Map metadata; - /** - * @return Indicates if the volume can be attached to more then one server. - * - */ - private Boolean multiattach; /** * @return See Argument Reference above. * @@ -117,13 +111,6 @@ public String id() { public Map metadata() { return this.metadata; } - /** - * @return Indicates if the volume can be attached to more then one server. - * - */ - public Boolean multiattach() { - return this.multiattach; - } /** * @return See Argument Reference above. * @@ -181,7 +168,6 @@ public static final class Builder { private String host; private String id; private Map metadata; - private Boolean multiattach; private String name; private String region; private Integer size; @@ -196,7 +182,6 @@ public Builder(GetVolumeV3Result defaults) { this.host = defaults.host; this.id = defaults.id; this.metadata = defaults.metadata; - this.multiattach = defaults.multiattach; this.name = defaults.name; this.region = defaults.region; this.size = defaults.size; @@ -249,14 +234,6 @@ public Builder metadata(Map metadata) { return this; } @CustomType.Setter - public Builder multiattach(Boolean multiattach) { - if (multiattach == null) { - throw new MissingRequiredPropertyException("GetVolumeV3Result", "multiattach"); - } - this.multiattach = multiattach; - return this; - } - @CustomType.Setter public Builder name(String name) { if (name == null) { throw new MissingRequiredPropertyException("GetVolumeV3Result", "name"); @@ -311,7 +288,6 @@ public GetVolumeV3Result build() { _resultValue.host = host; _resultValue.id = id; _resultValue.metadata = metadata; - _resultValue.multiattach = multiattach; _resultValue.name = name; _resultValue.region = region; _resultValue.size = size; diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/Instance.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/Instance.java index b778df111..db698c42c 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/compute/Instance.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/Instance.java @@ -15,7 +15,6 @@ import com.pulumi.openstack.compute.outputs.InstancePersonality; import com.pulumi.openstack.compute.outputs.InstanceSchedulerHint; import com.pulumi.openstack.compute.outputs.InstanceVendorOptions; -import com.pulumi.openstack.compute.outputs.InstanceVolume; import java.lang.Boolean; import java.lang.Object; import java.lang.String; @@ -220,18 +219,6 @@ public Output flavorId() { public Output flavorName() { return this.flavorName; } - /** - * @deprecated - * Use the openstack.compute.FloatingIpAssociate resource instead - * - */ - @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */ - @Export(name="floatingIp", refs={String.class}, tree="[0]") - private Output floatingIp; - - public Output> floatingIp() { - return Codegen.optional(this.floatingIp); - } /** * Whether to force the OpenStack instance to be * forcefully deleted. This is useful for environments that have reclaim / soft @@ -550,18 +537,6 @@ public Output> userData() { public Output> vendorOptions() { return Codegen.optional(this.vendorOptions); } - /** - * @deprecated - * Use block_device or openstack.compute.VolumeAttach instead - * - */ - @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */ - @Export(name="volumes", refs={List.class,InstanceVolume.class}, tree="[0,1]") - private Output> volumes; - - public Output>> volumes() { - return Codegen.optional(this.volumes); - } /** * diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/InstanceArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/InstanceArgs.java index bbbdd7031..905921c67 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/compute/InstanceArgs.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/InstanceArgs.java @@ -10,7 +10,6 @@ import com.pulumi.openstack.compute.inputs.InstancePersonalityArgs; import com.pulumi.openstack.compute.inputs.InstanceSchedulerHintArgs; import com.pulumi.openstack.compute.inputs.InstanceVendorOptionsArgs; -import com.pulumi.openstack.compute.inputs.InstanceVolumeArgs; import java.lang.Boolean; import java.lang.Object; import java.lang.String; @@ -192,25 +191,6 @@ public Optional> flavorName() { return Optional.ofNullable(this.flavorName); } - /** - * @deprecated - * Use the openstack.compute.FloatingIpAssociate resource instead - * - */ - @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */ - @Import(name="floatingIp") - private @Nullable Output floatingIp; - - /** - * @deprecated - * Use the openstack.compute.FloatingIpAssociate resource instead - * - */ - @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */ - public Optional> floatingIp() { - return Optional.ofNullable(this.floatingIp); - } - /** * Whether to force the OpenStack instance to be * forcefully deleted. This is useful for environments that have reclaim / soft @@ -532,25 +512,6 @@ public Optional> vendorOptions() { return Optional.ofNullable(this.vendorOptions); } - /** - * @deprecated - * Use block_device or openstack.compute.VolumeAttach instead - * - */ - @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */ - @Import(name="volumes") - private @Nullable Output> volumes; - - /** - * @deprecated - * Use block_device or openstack.compute.VolumeAttach instead - * - */ - @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */ - public Optional>> volumes() { - return Optional.ofNullable(this.volumes); - } - private InstanceArgs() {} private InstanceArgs(InstanceArgs $) { @@ -563,7 +524,6 @@ private InstanceArgs(InstanceArgs $) { this.configDrive = $.configDrive; this.flavorId = $.flavorId; this.flavorName = $.flavorName; - this.floatingIp = $.floatingIp; this.forceDelete = $.forceDelete; this.imageId = $.imageId; this.imageName = $.imageName; @@ -581,7 +541,6 @@ private InstanceArgs(InstanceArgs $) { this.tags = $.tags; this.userData = $.userData; this.vendorOptions = $.vendorOptions; - this.volumes = $.volumes; } public static Builder builder() { @@ -838,31 +797,6 @@ public Builder flavorName(String flavorName) { return flavorName(Output.of(flavorName)); } - /** - * @return builder - * - * @deprecated - * Use the openstack.compute.FloatingIpAssociate resource instead - * - */ - @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */ - public Builder floatingIp(@Nullable Output floatingIp) { - $.floatingIp = floatingIp; - return this; - } - - /** - * @return builder - * - * @deprecated - * Use the openstack.compute.FloatingIpAssociate resource instead - * - */ - @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */ - public Builder floatingIp(String floatingIp) { - return floatingIp(Output.of(floatingIp)); - } - /** * @param forceDelete Whether to force the OpenStack instance to be * forcefully deleted. This is useful for environments that have reclaim / soft @@ -1347,43 +1281,6 @@ public Builder vendorOptions(InstanceVendorOptionsArgs vendorOptions) { return vendorOptions(Output.of(vendorOptions)); } - /** - * @return builder - * - * @deprecated - * Use block_device or openstack.compute.VolumeAttach instead - * - */ - @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */ - public Builder volumes(@Nullable Output> volumes) { - $.volumes = volumes; - return this; - } - - /** - * @return builder - * - * @deprecated - * Use block_device or openstack.compute.VolumeAttach instead - * - */ - @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */ - public Builder volumes(List volumes) { - return volumes(Output.of(volumes)); - } - - /** - * @return builder - * - * @deprecated - * Use block_device or openstack.compute.VolumeAttach instead - * - */ - @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */ - public Builder volumes(InstanceVolumeArgs... volumes) { - return volumes(List.of(volumes)); - } - public InstanceArgs build() { return $; } diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/ServerGroup.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/ServerGroup.java index 0084fa35d..1a8b3d62f 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/compute/ServerGroup.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/ServerGroup.java @@ -35,6 +35,10 @@ * import com.pulumi.core.Output; * import com.pulumi.openstack.compute.ServerGroup; * import com.pulumi.openstack.compute.ServerGroupArgs; + * import com.pulumi.openstack.compute.Instance; + * import com.pulumi.openstack.compute.InstanceArgs; + * import com.pulumi.openstack.compute.inputs.InstanceSchedulerHintArgs; + * import com.pulumi.openstack.compute.inputs.InstanceNetworkArgs; * import java.util.List; * import java.util.ArrayList; * import java.util.Map; @@ -53,6 +57,18 @@ * .policies("anti-affinity") * .build()); * + * var test_instance = new Instance("test-instance", InstanceArgs.builder() + * .name("my-instance") + * .imageId("ad091b52-742f-469e-8f3c-fd81cadf0743") + * .flavorId("3") + * .schedulerHints(InstanceSchedulerHintArgs.builder() + * .group(test_sg.id()) + * .build()) + * .networks(InstanceNetworkArgs.builder() + * .name("my_network") + * .build()) + * .build()); + * * } * } * } @@ -72,6 +88,10 @@ * import com.pulumi.openstack.compute.ServerGroup; * import com.pulumi.openstack.compute.ServerGroupArgs; * import com.pulumi.openstack.compute.inputs.ServerGroupRulesArgs; + * import com.pulumi.openstack.compute.Instance; + * import com.pulumi.openstack.compute.InstanceArgs; + * import com.pulumi.openstack.compute.inputs.InstanceSchedulerHintArgs; + * import com.pulumi.openstack.compute.inputs.InstanceNetworkArgs; * import java.util.List; * import java.util.ArrayList; * import java.util.Map; @@ -93,6 +113,18 @@ * .build()) * .build()); * + * var test_instance = new Instance("test-instance", InstanceArgs.builder() + * .name("my-instance") + * .imageId("ad091b52-742f-469e-8f3c-fd81cadf0743") + * .flavorId("3") + * .schedulerHints(InstanceSchedulerHintArgs.builder() + * .group(test_sg.id()) + * .build()) + * .networks(InstanceNetworkArgs.builder() + * .name("my_network") + * .build()) + * .build()); + * * } * } * } diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/VolumeAttach.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/VolumeAttach.java index 69ad83277..0be156dc3 100644 --- a/sdk/java/src/main/java/com/pulumi/openstack/compute/VolumeAttach.java +++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/VolumeAttach.java @@ -75,7 +75,7 @@ * ### Using Multiattach-enabled volumes * * Multiattach Volumes are dependent upon your OpenStack cloud and not all - * clouds support multiattach. + * clouds support multiattach. Multiattach volumes require a volume_type that has [multiattach enabled](https://docs.openstack.org/cinder/latest/admin/volume-multiattach.html#multiattach-volume-type). * * <!--Start PulumiCodeChooser --> * 
@@ -108,7 +108,7 @@
  *         var volume1 = new Volume("volume1", VolumeArgs.builder()        
  *             .name("volume_1")
  *             .size(1)
- *             .multiattach(true)
+ *             .volumeType("multiattach")
  *             .build());
  * 
  *         var instance1 = new Instance("instance1", InstanceArgs.builder()        
@@ -210,6 +210,24 @@ public Output> multiattach() {
     public Output region() {
         return this.region;
     }
+    /**
+     * Add a device role tag that is applied to the volume when
+     * attaching it to the VM. Changing this creates a new volume attachment with
+     * the new tag. Requires microversion >= 2.49.
+     * 
+     */
+    @Export(name="tag", refs={String.class}, tree="[0]")
+    private Output tag;
+
+    /**
+     * @return Add a device role tag that is applied to the volume when
+     * attaching it to the VM. Changing this creates a new volume attachment with
+     * the new tag. Requires microversion >= 2.49.
+     * 
+     */
+    public Output> tag() {
+        return Codegen.optional(this.tag);
+    }
     /**
      * Map of additional vendor-specific options.
      * Supported options are described below.
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/VolumeAttachArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/VolumeAttachArgs.java
index 546aac230..51de89f60 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/compute/VolumeAttachArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/VolumeAttachArgs.java
@@ -76,6 +76,25 @@ public Optional> region() {
         return Optional.ofNullable(this.region);
     }
 
+    /**
+     * Add a device role tag that is applied to the volume when
+     * attaching it to the VM. Changing this creates a new volume attachment with
+     * the new tag. Requires microversion >= 2.49.
+     * 
+     */
+    @Import(name="tag")
+    private @Nullable Output tag;
+
+    /**
+     * @return Add a device role tag that is applied to the volume when
+     * attaching it to the VM. Changing this creates a new volume attachment with
+     * the new tag. Requires microversion >= 2.49.
+     * 
+     */
+    public Optional> tag() {
+        return Optional.ofNullable(this.tag);
+    }
+
     /**
      * Map of additional vendor-specific options.
      * Supported options are described below.
@@ -115,6 +134,7 @@ private VolumeAttachArgs(VolumeAttachArgs $) {
         this.instanceId = $.instanceId;
         this.multiattach = $.multiattach;
         this.region = $.region;
+        this.tag = $.tag;
         this.vendorOptions = $.vendorOptions;
         this.volumeId = $.volumeId;
     }
@@ -215,6 +235,31 @@ public Builder region(String region) {
             return region(Output.of(region));
         }
 
+        /**
+         * @param tag Add a device role tag that is applied to the volume when
+         * attaching it to the VM. Changing this creates a new volume attachment with
+         * the new tag. Requires microversion >= 2.49.
+         * 
+         * @return builder
+         * 
+         */
+        public Builder tag(@Nullable Output tag) {
+            $.tag = tag;
+            return this;
+        }
+
+        /**
+         * @param tag Add a device role tag that is applied to the volume when
+         * attaching it to the VM. Changing this creates a new volume attachment with
+         * the new tag. Requires microversion >= 2.49.
+         * 
+         * @return builder
+         * 
+         */
+        public Builder tag(String tag) {
+            return tag(Output.of(tag));
+        }
+
         /**
          * @param vendorOptions Map of additional vendor-specific options.
          * Supported options are described below.
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceNetworkArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceNetworkArgs.java
index b79d66434..18bb7be41 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceNetworkArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceNetworkArgs.java
@@ -57,25 +57,6 @@ public Optional> fixedIpV6() {
         return Optional.ofNullable(this.fixedIpV6);
     }
 
-    /**
-     * @deprecated
-     * Use the openstack.compute.FloatingIpAssociate resource instead
-     * 
-     */
-    @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */
-    @Import(name="floatingIp")
-    private @Nullable Output floatingIp;
-
-    /**
-     * @deprecated
-     * Use the openstack.compute.FloatingIpAssociate resource instead
-     * 
-     */
-    @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */
-    public Optional> floatingIp() {
-        return Optional.ofNullable(this.floatingIp);
-    }
-
     @Import(name="mac")
     private @Nullable Output mac;
 
@@ -140,7 +121,6 @@ private InstanceNetworkArgs(InstanceNetworkArgs $) {
         this.accessNetwork = $.accessNetwork;
         this.fixedIpV4 = $.fixedIpV4;
         this.fixedIpV6 = $.fixedIpV6;
-        this.floatingIp = $.floatingIp;
         this.mac = $.mac;
         this.name = $.name;
         this.port = $.port;
@@ -220,31 +200,6 @@ public Builder fixedIpV6(String fixedIpV6) {
             return fixedIpV6(Output.of(fixedIpV6));
         }
 
-        /**
-         * @return builder
-         * 
-         * @deprecated
-         * Use the openstack.compute.FloatingIpAssociate resource instead
-         * 
-         */
-        @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */
-        public Builder floatingIp(@Nullable Output floatingIp) {
-            $.floatingIp = floatingIp;
-            return this;
-        }
-
-        /**
-         * @return builder
-         * 
-         * @deprecated
-         * Use the openstack.compute.FloatingIpAssociate resource instead
-         * 
-         */
-        @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */
-        public Builder floatingIp(String floatingIp) {
-            return floatingIp(Output.of(floatingIp));
-        }
-
         public Builder mac(@Nullable Output mac) {
             $.mac = mac;
             return this;
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceSchedulerHintArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceSchedulerHintArgs.java
index 9b87fbd79..4c409467f 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceSchedulerHintArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceSchedulerHintArgs.java
@@ -86,7 +86,8 @@ public Optional>> differentHosts() {
 
     /**
      * A UUID of a Server Group. The instance will be placed
-     * into that group.
+     * into that group. See reference
+     * for details on managing servergroup resources
      * 
      */
     @Import(name="group")
@@ -94,7 +95,8 @@ public Optional>> differentHosts() {
 
     /**
      * @return A UUID of a Server Group. The instance will be placed
-     * into that group.
+     * into that group. See reference
+     * for details on managing servergroup resources
      * 
      */
     public Optional> group() {
@@ -302,7 +304,8 @@ public Builder differentHosts(String... differentHosts) {
 
         /**
          * @param group A UUID of a Server Group. The instance will be placed
-         * into that group.
+         * into that group. See reference
+         * for details on managing servergroup resources
          * 
          * @return builder
          * 
@@ -314,7 +317,8 @@ public Builder group(@Nullable Output group) {
 
         /**
          * @param group A UUID of a Server Group. The instance will be placed
-         * into that group.
+         * into that group. See reference
+         * for details on managing servergroup resources
          * 
          * @return builder
          * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceState.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceState.java
index 3dac6a2b6..2c39974e5 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceState.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceState.java
@@ -10,7 +10,6 @@
 import com.pulumi.openstack.compute.inputs.InstancePersonalityArgs;
 import com.pulumi.openstack.compute.inputs.InstanceSchedulerHintArgs;
 import com.pulumi.openstack.compute.inputs.InstanceVendorOptionsArgs;
-import com.pulumi.openstack.compute.inputs.InstanceVolumeArgs;
 import java.lang.Boolean;
 import java.lang.Object;
 import java.lang.String;
@@ -231,25 +230,6 @@ public Optional> flavorName() {
         return Optional.ofNullable(this.flavorName);
     }
 
-    /**
-     * @deprecated
-     * Use the openstack.compute.FloatingIpAssociate resource instead
-     * 
-     */
-    @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */
-    @Import(name="floatingIp")
-    private @Nullable Output floatingIp;
-
-    /**
-     * @deprecated
-     * Use the openstack.compute.FloatingIpAssociate resource instead
-     * 
-     */
-    @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */
-    public Optional> floatingIp() {
-        return Optional.ofNullable(this.floatingIp);
-    }
-
     /**
      * Whether to force the OpenStack instance to be
      * forcefully deleted. This is useful for environments that have reclaim / soft
@@ -586,25 +566,6 @@ public Optional> vendorOptions() {
         return Optional.ofNullable(this.vendorOptions);
     }
 
-    /**
-     * @deprecated
-     * Use block_device or openstack.compute.VolumeAttach instead
-     * 
-     */
-    @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */
-    @Import(name="volumes")
-    private @Nullable Output> volumes;
-
-    /**
-     * @deprecated
-     * Use block_device or openstack.compute.VolumeAttach instead
-     * 
-     */
-    @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */
-    public Optional>> volumes() {
-        return Optional.ofNullable(this.volumes);
-    }
-
     private InstanceState() {}
 
     private InstanceState(InstanceState $) {
@@ -620,7 +581,6 @@ private InstanceState(InstanceState $) {
         this.created = $.created;
         this.flavorId = $.flavorId;
         this.flavorName = $.flavorName;
-        this.floatingIp = $.floatingIp;
         this.forceDelete = $.forceDelete;
         this.imageId = $.imageId;
         this.imageName = $.imageName;
@@ -639,7 +599,6 @@ private InstanceState(InstanceState $) {
         this.updated = $.updated;
         this.userData = $.userData;
         this.vendorOptions = $.vendorOptions;
-        this.volumes = $.volumes;
     }
 
     public static Builder builder() {
@@ -960,31 +919,6 @@ public Builder flavorName(String flavorName) {
             return flavorName(Output.of(flavorName));
         }
 
-        /**
-         * @return builder
-         * 
-         * @deprecated
-         * Use the openstack.compute.FloatingIpAssociate resource instead
-         * 
-         */
-        @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */
-        public Builder floatingIp(@Nullable Output floatingIp) {
-            $.floatingIp = floatingIp;
-            return this;
-        }
-
-        /**
-         * @return builder
-         * 
-         * @deprecated
-         * Use the openstack.compute.FloatingIpAssociate resource instead
-         * 
-         */
-        @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */
-        public Builder floatingIp(String floatingIp) {
-            return floatingIp(Output.of(floatingIp));
-        }
-
         /**
          * @param forceDelete Whether to force the OpenStack instance to be
          * forcefully deleted. This is useful for environments that have reclaim / soft
@@ -1490,43 +1424,6 @@ public Builder vendorOptions(InstanceVendorOptionsArgs vendorOptions) {
             return vendorOptions(Output.of(vendorOptions));
         }
 
-        /**
-         * @return builder
-         * 
-         * @deprecated
-         * Use block_device or openstack.compute.VolumeAttach instead
-         * 
-         */
-        @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */
-        public Builder volumes(@Nullable Output> volumes) {
-            $.volumes = volumes;
-            return this;
-        }
-
-        /**
-         * @return builder
-         * 
-         * @deprecated
-         * Use block_device or openstack.compute.VolumeAttach instead
-         * 
-         */
-        @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */
-        public Builder volumes(List volumes) {
-            return volumes(Output.of(volumes));
-        }
-
-        /**
-         * @return builder
-         * 
-         * @deprecated
-         * Use block_device or openstack.compute.VolumeAttach instead
-         * 
-         */
-        @Deprecated /* Use block_device or openstack.compute.VolumeAttach instead */
-        public Builder volumes(InstanceVolumeArgs... volumes) {
-            return volumes(List.of(volumes));
-        }
-
         public InstanceState build() {
             return $;
         }
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceVolumeArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceVolumeArgs.java
deleted file mode 100644
index 097ebfd62..000000000
--- a/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/InstanceVolumeArgs.java
+++ /dev/null
@@ -1,101 +0,0 @@
-// *** WARNING: this file was generated by pulumi-java-gen. ***
-// *** Do not edit by hand unless you're certain you know what you are doing! ***
-
-package com.pulumi.openstack.compute.inputs;
-
-import com.pulumi.core.Output;
-import com.pulumi.core.annotations.Import;
-import com.pulumi.exceptions.MissingRequiredPropertyException;
-import java.lang.String;
-import java.util.Objects;
-import java.util.Optional;
-import javax.annotation.Nullable;
-
-
-public final class InstanceVolumeArgs extends com.pulumi.resources.ResourceArgs {
-
-    public static final InstanceVolumeArgs Empty = new InstanceVolumeArgs();
-
-    @Import(name="device")
-    private @Nullable Output device;
-
-    public Optional> device() {
-        return Optional.ofNullable(this.device);
-    }
-
-    @Import(name="id")
-    private @Nullable Output id;
-
-    public Optional> id() {
-        return Optional.ofNullable(this.id);
-    }
-
-    @Import(name="volumeId", required=true)
-    private Output volumeId;
-
-    public Output volumeId() {
-        return this.volumeId;
-    }
-
-    private InstanceVolumeArgs() {}
-
-    private InstanceVolumeArgs(InstanceVolumeArgs $) {
-        this.device = $.device;
-        this.id = $.id;
-        this.volumeId = $.volumeId;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-    public static Builder builder(InstanceVolumeArgs defaults) {
-        return new Builder(defaults);
-    }
-
-    public static final class Builder {
-        private InstanceVolumeArgs $;
-
-        public Builder() {
-            $ = new InstanceVolumeArgs();
-        }
-
-        public Builder(InstanceVolumeArgs defaults) {
-            $ = new InstanceVolumeArgs(Objects.requireNonNull(defaults));
-        }
-
-        public Builder device(@Nullable Output device) {
-            $.device = device;
-            return this;
-        }
-
-        public Builder device(String device) {
-            return device(Output.of(device));
-        }
-
-        public Builder id(@Nullable Output id) {
-            $.id = id;
-            return this;
-        }
-
-        public Builder id(String id) {
-            return id(Output.of(id));
-        }
-
-        public Builder volumeId(Output volumeId) {
-            $.volumeId = volumeId;
-            return this;
-        }
-
-        public Builder volumeId(String volumeId) {
-            return volumeId(Output.of(volumeId));
-        }
-
-        public InstanceVolumeArgs build() {
-            if ($.volumeId == null) {
-                throw new MissingRequiredPropertyException("InstanceVolumeArgs", "volumeId");
-            }
-            return $;
-        }
-    }
-
-}
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/VolumeAttachState.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/VolumeAttachState.java
index a30d237ef..f2048a86d 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/VolumeAttachState.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/inputs/VolumeAttachState.java
@@ -75,6 +75,25 @@ public Optional> region() {
         return Optional.ofNullable(this.region);
     }
 
+    /**
+     * Add a device role tag that is applied to the volume when
+     * attaching it to the VM. Changing this creates a new volume attachment with
+     * the new tag. Requires microversion >= 2.49.
+     * 
+     */
+    @Import(name="tag")
+    private @Nullable Output tag;
+
+    /**
+     * @return Add a device role tag that is applied to the volume when
+     * attaching it to the VM. Changing this creates a new volume attachment with
+     * the new tag. Requires microversion >= 2.49.
+     * 
+     */
+    public Optional> tag() {
+        return Optional.ofNullable(this.tag);
+    }
+
     /**
      * Map of additional vendor-specific options.
      * Supported options are described below.
@@ -114,6 +133,7 @@ private VolumeAttachState(VolumeAttachState $) {
         this.instanceId = $.instanceId;
         this.multiattach = $.multiattach;
         this.region = $.region;
+        this.tag = $.tag;
         this.vendorOptions = $.vendorOptions;
         this.volumeId = $.volumeId;
     }
@@ -214,6 +234,31 @@ public Builder region(String region) {
             return region(Output.of(region));
         }
 
+        /**
+         * @param tag Add a device role tag that is applied to the volume when
+         * attaching it to the VM. Changing this creates a new volume attachment with
+         * the new tag. Requires microversion >= 2.49.
+         * 
+         * @return builder
+         * 
+         */
+        public Builder tag(@Nullable Output tag) {
+            $.tag = tag;
+            return this;
+        }
+
+        /**
+         * @param tag Add a device role tag that is applied to the volume when
+         * attaching it to the VM. Changing this creates a new volume attachment with
+         * the new tag. Requires microversion >= 2.49.
+         * 
+         * @return builder
+         * 
+         */
+        public Builder tag(String tag) {
+            return tag(Output.of(tag));
+        }
+
         /**
          * @param vendorOptions Map of additional vendor-specific options.
          * Supported options are described below.
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceNetwork.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceNetwork.java
index d7a769ccd..885cbe059 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceNetwork.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceNetwork.java
@@ -25,13 +25,6 @@ public final class InstanceNetwork {
      */
     private @Nullable String fixedIpV4;
     private @Nullable String fixedIpV6;
-    /**
-     * @deprecated
-     * Use the openstack.compute.FloatingIpAssociate resource instead
-     * 
-     */
-    @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */
-    private @Nullable String floatingIp;
     private @Nullable String mac;
     /**
      * @return The human-readable
@@ -72,15 +65,6 @@ public Optional fixedIpV4() {
     public Optional fixedIpV6() {
         return Optional.ofNullable(this.fixedIpV6);
     }
-    /**
-     * @deprecated
-     * Use the openstack.compute.FloatingIpAssociate resource instead
-     * 
-     */
-    @Deprecated /* Use the openstack.compute.FloatingIpAssociate resource instead */
-    public Optional floatingIp() {
-        return Optional.ofNullable(this.floatingIp);
-    }
     public Optional mac() {
         return Optional.ofNullable(this.mac);
     }
@@ -121,7 +105,6 @@ public static final class Builder {
         private @Nullable Boolean accessNetwork;
         private @Nullable String fixedIpV4;
         private @Nullable String fixedIpV6;
-        private @Nullable String floatingIp;
         private @Nullable String mac;
         private @Nullable String name;
         private @Nullable String port;
@@ -132,7 +115,6 @@ public Builder(InstanceNetwork defaults) {
     	      this.accessNetwork = defaults.accessNetwork;
     	      this.fixedIpV4 = defaults.fixedIpV4;
     	      this.fixedIpV6 = defaults.fixedIpV6;
-    	      this.floatingIp = defaults.floatingIp;
     	      this.mac = defaults.mac;
     	      this.name = defaults.name;
     	      this.port = defaults.port;
@@ -158,12 +140,6 @@ public Builder fixedIpV6(@Nullable String fixedIpV6) {
             return this;
         }
         @CustomType.Setter
-        public Builder floatingIp(@Nullable String floatingIp) {
-
-            this.floatingIp = floatingIp;
-            return this;
-        }
-        @CustomType.Setter
         public Builder mac(@Nullable String mac) {
 
             this.mac = mac;
@@ -192,7 +168,6 @@ public InstanceNetwork build() {
             _resultValue.accessNetwork = accessNetwork;
             _resultValue.fixedIpV4 = fixedIpV4;
             _resultValue.fixedIpV6 = fixedIpV6;
-            _resultValue.floatingIp = floatingIp;
             _resultValue.mac = mac;
             _resultValue.name = name;
             _resultValue.port = port;
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceSchedulerHint.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceSchedulerHint.java
index 7b5f59e5f..f198d3c8e 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceSchedulerHint.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceSchedulerHint.java
@@ -39,7 +39,8 @@ public final class InstanceSchedulerHint {
     private @Nullable List differentHosts;
     /**
      * @return A UUID of a Server Group. The instance will be placed
-     * into that group.
+     * into that group. See reference
+     * for details on managing servergroup resources
      * 
      */
     private @Nullable String group;
@@ -99,7 +100,8 @@ public List differentHosts() {
     }
     /**
      * @return A UUID of a Server Group. The instance will be placed
-     * into that group.
+     * into that group. See reference
+     * for details on managing servergroup resources
      * 
      */
     public Optional group() {
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceVolume.java b/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceVolume.java
deleted file mode 100644
index 2cab353d9..000000000
--- a/sdk/java/src/main/java/com/pulumi/openstack/compute/outputs/InstanceVolume.java
+++ /dev/null
@@ -1,78 +0,0 @@
-// *** WARNING: this file was generated by pulumi-java-gen. ***
-// *** Do not edit by hand unless you're certain you know what you are doing! ***
-
-package com.pulumi.openstack.compute.outputs;
-
-import com.pulumi.core.annotations.CustomType;
-import com.pulumi.exceptions.MissingRequiredPropertyException;
-import java.lang.String;
-import java.util.Objects;
-import java.util.Optional;
-import javax.annotation.Nullable;
-
-@CustomType
-public final class InstanceVolume {
-    private @Nullable String device;
-    private @Nullable String id;
-    private String volumeId;
-
-    private InstanceVolume() {}
-    public Optional device() {
-        return Optional.ofNullable(this.device);
-    }
-    public Optional id() {
-        return Optional.ofNullable(this.id);
-    }
-    public String volumeId() {
-        return this.volumeId;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static Builder builder(InstanceVolume defaults) {
-        return new Builder(defaults);
-    }
-    @CustomType.Builder
-    public static final class Builder {
-        private @Nullable String device;
-        private @Nullable String id;
-        private String volumeId;
-        public Builder() {}
-        public Builder(InstanceVolume defaults) {
-    	      Objects.requireNonNull(defaults);
-    	      this.device = defaults.device;
-    	      this.id = defaults.id;
-    	      this.volumeId = defaults.volumeId;
-        }
-
-        @CustomType.Setter
-        public Builder device(@Nullable String device) {
-
-            this.device = device;
-            return this;
-        }
-        @CustomType.Setter
-        public Builder id(@Nullable String id) {
-
-            this.id = id;
-            return this;
-        }
-        @CustomType.Setter
-        public Builder volumeId(String volumeId) {
-            if (volumeId == null) {
-              throw new MissingRequiredPropertyException("InstanceVolume", "volumeId");
-            }
-            this.volumeId = volumeId;
-            return this;
-        }
-        public InstanceVolume build() {
-            final var _resultValue = new InstanceVolume();
-            _resultValue.device = device;
-            _resultValue.id = id;
-            _resultValue.volumeId = volumeId;
-            return _resultValue;
-        }
-    }
-}
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/images/Image.java b/sdk/java/src/main/java/com/pulumi/openstack/images/Image.java
index 89418ef85..53e45626e 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/images/Image.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/images/Image.java
@@ -488,24 +488,6 @@ public Output status() {
     public Output>> tags() {
         return Codegen.optional(this.tags);
     }
-    /**
-     * (**Deprecated** - use `updated_at` instead)
-     * 
-     * @deprecated
-     * Use updated_at instead
-     * 
-     */
-    @Deprecated /* Use updated_at instead */
-    @Export(name="updateAt", refs={String.class}, tree="[0]")
-    private Output updateAt;
-
-    /**
-     * @return (**Deprecated** - use `updated_at` instead)
-     * 
-     */
-    public Output updateAt() {
-        return this.updateAt;
-    }
     /**
      * The date the image was last updated.
      * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageArgs.java
index 9197cccb9..f0c71f52f 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageArgs.java
@@ -197,33 +197,26 @@ public Optional> sizeMin() {
     }
 
     /**
-     * Order the results in either `asc` or `desc`.
+     * Sorts the response by one or more attribute and sort
+     * direction combinations. You can also set multiple sort keys and directions.
+     * Default direction is `desc`. Use the comma (,) character to separate
+     * multiple values. For example expression `sort = "name:asc,status"`
+     * sorts ascending by name and descending by status.
      * 
      */
-    @Import(name="sortDirection")
-    private @Nullable Output sortDirection;
+    @Import(name="sort")
+    private @Nullable Output sort;
 
     /**
-     * @return Order the results in either `asc` or `desc`.
+     * @return Sorts the response by one or more attribute and sort
+     * direction combinations. You can also set multiple sort keys and directions.
+     * Default direction is `desc`. Use the comma (,) character to separate
+     * multiple values. For example expression `sort = "name:asc,status"`
+     * sorts ascending by name and descending by status.
      * 
      */
-    public Optional> sortDirection() {
-        return Optional.ofNullable(this.sortDirection);
-    }
-
-    /**
-     * Sort images based on a certain key. Defaults to `name`.
-     * 
-     */
-    @Import(name="sortKey")
-    private @Nullable Output sortKey;
-
-    /**
-     * @return Sort images based on a certain key. Defaults to `name`.
-     * 
-     */
-    public Optional> sortKey() {
-        return Optional.ofNullable(this.sortKey);
+    public Optional> sort() {
+        return Optional.ofNullable(this.sort);
     }
 
     /**
@@ -288,8 +281,7 @@ private GetImageArgs(GetImageArgs $) {
         this.region = $.region;
         this.sizeMax = $.sizeMax;
         this.sizeMin = $.sizeMin;
-        this.sortDirection = $.sortDirection;
-        this.sortKey = $.sortKey;
+        this.sort = $.sort;
         this.tag = $.tag;
         this.tags = $.tags;
         this.visibility = $.visibility;
@@ -550,45 +542,32 @@ public Builder sizeMin(Integer sizeMin) {
         }
 
         /**
-         * @param sortDirection Order the results in either `asc` or `desc`.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder sortDirection(@Nullable Output sortDirection) {
-            $.sortDirection = sortDirection;
-            return this;
-        }
-
-        /**
-         * @param sortDirection Order the results in either `asc` or `desc`.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder sortDirection(String sortDirection) {
-            return sortDirection(Output.of(sortDirection));
-        }
-
-        /**
-         * @param sortKey Sort images based on a certain key. Defaults to `name`.
+         * @param sort Sorts the response by one or more attribute and sort
+         * direction combinations. You can also set multiple sort keys and directions.
+         * Default direction is `desc`. Use the comma (,) character to separate
+         * multiple values. For example expression `sort = "name:asc,status"`
+         * sorts ascending by name and descending by status.
          * 
          * @return builder
          * 
          */
-        public Builder sortKey(@Nullable Output sortKey) {
-            $.sortKey = sortKey;
+        public Builder sort(@Nullable Output sort) {
+            $.sort = sort;
             return this;
         }
 
         /**
-         * @param sortKey Sort images based on a certain key. Defaults to `name`.
+         * @param sort Sorts the response by one or more attribute and sort
+         * direction combinations. You can also set multiple sort keys and directions.
+         * Default direction is `desc`. Use the comma (,) character to separate
+         * multiple values. For example expression `sort = "name:asc,status"`
+         * sorts ascending by name and descending by status.
          * 
          * @return builder
          * 
          */
-        public Builder sortKey(String sortKey) {
-            return sortKey(Output.of(sortKey));
+        public Builder sort(String sort) {
+            return sort(Output.of(sort));
         }
 
         /**
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageIdsArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageIdsArgs.java
index d30f51785..2c44b36bf 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageIdsArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageIdsArgs.java
@@ -164,9 +164,7 @@ public Optional> sizeMin() {
      * direction combinations. You can also set multiple sort keys and directions.
      * Default direction is `desc`. Use the comma (,) character to separate
      * multiple values. For example expression `sort = "name:asc,status"`
-     * sorts ascending by name and descending by status. `sort` cannot be used
-     * simultaneously with `sort_key`. If both are present in a configuration
-     * then only `sort` will be used.
+     * sorts ascending by name and descending by status.
      * 
      */
     @Import(name="sort")
@@ -177,67 +175,13 @@ public Optional> sizeMin() {
      * direction combinations. You can also set multiple sort keys and directions.
      * Default direction is `desc`. Use the comma (,) character to separate
      * multiple values. For example expression `sort = "name:asc,status"`
-     * sorts ascending by name and descending by status. `sort` cannot be used
-     * simultaneously with `sort_key`. If both are present in a configuration
-     * then only `sort` will be used.
+     * sorts ascending by name and descending by status.
      * 
      */
     public Optional> sort() {
         return Optional.ofNullable(this.sort);
     }
 
-    /**
-     * Order the results in either `asc` or `desc`.
-     * Can be applied only with `sort_key`. Defaults to `asc`
-     * 
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    @Import(name="sortDirection")
-    private @Nullable Output sortDirection;
-
-    /**
-     * @return Order the results in either `asc` or `desc`.
-     * Can be applied only with `sort_key`. Defaults to `asc`
-     * 
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    public Optional> sortDirection() {
-        return Optional.ofNullable(this.sortDirection);
-    }
-
-    /**
-     * Sort images based on a certain key. Defaults to
-     * `name`. `sort_key` cannot be used simultaneously with `sort`. If both
-     * are present in a configuration then only `sort` will be used.
-     * 
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    @Import(name="sortKey")
-    private @Nullable Output sortKey;
-
-    /**
-     * @return Sort images based on a certain key. Defaults to
-     * `name`. `sort_key` cannot be used simultaneously with `sort`. If both
-     * are present in a configuration then only `sort` will be used.
-     * 
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    public Optional> sortKey() {
-        return Optional.ofNullable(this.sortKey);
-    }
-
     /**
      * Search for images with a specific tag.
      * 
@@ -299,8 +243,6 @@ private GetImageIdsArgs(GetImageIdsArgs $) {
         this.sizeMax = $.sizeMax;
         this.sizeMin = $.sizeMin;
         this.sort = $.sort;
-        this.sortDirection = $.sortDirection;
-        this.sortKey = $.sortKey;
         this.tag = $.tag;
         this.tags = $.tags;
         this.visibility = $.visibility;
@@ -517,9 +459,7 @@ public Builder sizeMin(Integer sizeMin) {
          * direction combinations. You can also set multiple sort keys and directions.
          * Default direction is `desc`. Use the comma (,) character to separate
          * multiple values. For example expression `sort = "name:asc,status"`
-         * sorts ascending by name and descending by status. `sort` cannot be used
-         * simultaneously with `sort_key`. If both are present in a configuration
-         * then only `sort` will be used.
+         * sorts ascending by name and descending by status.
          * 
          * @return builder
          * 
@@ -534,9 +474,7 @@ public Builder sort(@Nullable Output sort) {
          * direction combinations. You can also set multiple sort keys and directions.
          * Default direction is `desc`. Use the comma (,) character to separate
          * multiple values. For example expression `sort = "name:asc,status"`
-         * sorts ascending by name and descending by status. `sort` cannot be used
-         * simultaneously with `sort_key`. If both are present in a configuration
-         * then only `sort` will be used.
+         * sorts ascending by name and descending by status.
          * 
          * @return builder
          * 
@@ -545,70 +483,6 @@ public Builder sort(String sort) {
             return sort(Output.of(sort));
         }
 
-        /**
-         * @param sortDirection Order the results in either `asc` or `desc`.
-         * Can be applied only with `sort_key`. Defaults to `asc`
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use option 'sort' instead.
-         * 
-         */
-        @Deprecated /* Use option 'sort' instead. */
-        public Builder sortDirection(@Nullable Output sortDirection) {
-            $.sortDirection = sortDirection;
-            return this;
-        }
-
-        /**
-         * @param sortDirection Order the results in either `asc` or `desc`.
-         * Can be applied only with `sort_key`. Defaults to `asc`
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use option 'sort' instead.
-         * 
-         */
-        @Deprecated /* Use option 'sort' instead. */
-        public Builder sortDirection(String sortDirection) {
-            return sortDirection(Output.of(sortDirection));
-        }
-
-        /**
-         * @param sortKey Sort images based on a certain key. Defaults to
-         * `name`. `sort_key` cannot be used simultaneously with `sort`. If both
-         * are present in a configuration then only `sort` will be used.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use option 'sort' instead.
-         * 
-         */
-        @Deprecated /* Use option 'sort' instead. */
-        public Builder sortKey(@Nullable Output sortKey) {
-            $.sortKey = sortKey;
-            return this;
-        }
-
-        /**
-         * @param sortKey Sort images based on a certain key. Defaults to
-         * `name`. `sort_key` cannot be used simultaneously with `sort`. If both
-         * are present in a configuration then only `sort` will be used.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use option 'sort' instead.
-         * 
-         */
-        @Deprecated /* Use option 'sort' instead. */
-        public Builder sortKey(String sortKey) {
-            return sortKey(Output.of(sortKey));
-        }
-
         /**
          * @param tag Search for images with a specific tag.
          * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageIdsPlainArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageIdsPlainArgs.java
index 2ea64439e..6559c8cbf 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageIdsPlainArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImageIdsPlainArgs.java
@@ -163,9 +163,7 @@ public Optional sizeMin() {
      * direction combinations. You can also set multiple sort keys and directions.
      * Default direction is `desc`. Use the comma (,) character to separate
      * multiple values. For example expression `sort = "name:asc,status"`
-     * sorts ascending by name and descending by status. `sort` cannot be used
-     * simultaneously with `sort_key`. If both are present in a configuration
-     * then only `sort` will be used.
+     * sorts ascending by name and descending by status.
      * 
      */
     @Import(name="sort")
@@ -176,67 +174,13 @@ public Optional sizeMin() {
      * direction combinations. You can also set multiple sort keys and directions.
      * Default direction is `desc`. Use the comma (,) character to separate
      * multiple values. For example expression `sort = "name:asc,status"`
-     * sorts ascending by name and descending by status. `sort` cannot be used
-     * simultaneously with `sort_key`. If both are present in a configuration
-     * then only `sort` will be used.
+     * sorts ascending by name and descending by status.
      * 
      */
     public Optional sort() {
         return Optional.ofNullable(this.sort);
     }
 
-    /**
-     * Order the results in either `asc` or `desc`.
-     * Can be applied only with `sort_key`. Defaults to `asc`
-     * 
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    @Import(name="sortDirection")
-    private @Nullable String sortDirection;
-
-    /**
-     * @return Order the results in either `asc` or `desc`.
-     * Can be applied only with `sort_key`. Defaults to `asc`
-     * 
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    public Optional sortDirection() {
-        return Optional.ofNullable(this.sortDirection);
-    }
-
-    /**
-     * Sort images based on a certain key. Defaults to
-     * `name`. `sort_key` cannot be used simultaneously with `sort`. If both
-     * are present in a configuration then only `sort` will be used.
-     * 
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    @Import(name="sortKey")
-    private @Nullable String sortKey;
-
-    /**
-     * @return Sort images based on a certain key. Defaults to
-     * `name`. `sort_key` cannot be used simultaneously with `sort`. If both
-     * are present in a configuration then only `sort` will be used.
-     * 
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    public Optional sortKey() {
-        return Optional.ofNullable(this.sortKey);
-    }
-
     /**
      * Search for images with a specific tag.
      * 
@@ -298,8 +242,6 @@ private GetImageIdsPlainArgs(GetImageIdsPlainArgs $) {
         this.sizeMax = $.sizeMax;
         this.sizeMin = $.sizeMin;
         this.sort = $.sort;
-        this.sortDirection = $.sortDirection;
-        this.sortKey = $.sortKey;
         this.tag = $.tag;
         this.tags = $.tags;
         this.visibility = $.visibility;
@@ -426,9 +368,7 @@ public Builder sizeMin(@Nullable Integer sizeMin) {
          * direction combinations. You can also set multiple sort keys and directions.
          * Default direction is `desc`. Use the comma (,) character to separate
          * multiple values. For example expression `sort = "name:asc,status"`
-         * sorts ascending by name and descending by status. `sort` cannot be used
-         * simultaneously with `sort_key`. If both are present in a configuration
-         * then only `sort` will be used.
+         * sorts ascending by name and descending by status.
          * 
          * @return builder
          * 
@@ -438,39 +378,6 @@ public Builder sort(@Nullable String sort) {
             return this;
         }
 
-        /**
-         * @param sortDirection Order the results in either `asc` or `desc`.
-         * Can be applied only with `sort_key`. Defaults to `asc`
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use option 'sort' instead.
-         * 
-         */
-        @Deprecated /* Use option 'sort' instead. */
-        public Builder sortDirection(@Nullable String sortDirection) {
-            $.sortDirection = sortDirection;
-            return this;
-        }
-
-        /**
-         * @param sortKey Sort images based on a certain key. Defaults to
-         * `name`. `sort_key` cannot be used simultaneously with `sort`. If both
-         * are present in a configuration then only `sort` will be used.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use option 'sort' instead.
-         * 
-         */
-        @Deprecated /* Use option 'sort' instead. */
-        public Builder sortKey(@Nullable String sortKey) {
-            $.sortKey = sortKey;
-            return this;
-        }
-
         /**
          * @param tag Search for images with a specific tag.
          * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImagePlainArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImagePlainArgs.java
index 9bc7eabab..5160d8bd6 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImagePlainArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/GetImagePlainArgs.java
@@ -196,33 +196,26 @@ public Optional sizeMin() {
     }
 
     /**
-     * Order the results in either `asc` or `desc`.
+     * Sorts the response by one or more attribute and sort
+     * direction combinations. You can also set multiple sort keys and directions.
+     * Default direction is `desc`. Use the comma (,) character to separate
+     * multiple values. For example expression `sort = "name:asc,status"`
+     * sorts ascending by name and descending by status.
      * 
      */
-    @Import(name="sortDirection")
-    private @Nullable String sortDirection;
+    @Import(name="sort")
+    private @Nullable String sort;
 
     /**
-     * @return Order the results in either `asc` or `desc`.
+     * @return Sorts the response by one or more attribute and sort
+     * direction combinations. You can also set multiple sort keys and directions.
+     * Default direction is `desc`. Use the comma (,) character to separate
+     * multiple values. For example expression `sort = "name:asc,status"`
+     * sorts ascending by name and descending by status.
      * 
      */
-    public Optional sortDirection() {
-        return Optional.ofNullable(this.sortDirection);
-    }
-
-    /**
-     * Sort images based on a certain key. Defaults to `name`.
-     * 
-     */
-    @Import(name="sortKey")
-    private @Nullable String sortKey;
-
-    /**
-     * @return Sort images based on a certain key. Defaults to `name`.
-     * 
-     */
-    public Optional sortKey() {
-        return Optional.ofNullable(this.sortKey);
+    public Optional sort() {
+        return Optional.ofNullable(this.sort);
     }
 
     /**
@@ -287,8 +280,7 @@ private GetImagePlainArgs(GetImagePlainArgs $) {
         this.region = $.region;
         this.sizeMax = $.sizeMax;
         this.sizeMin = $.sizeMin;
-        this.sortDirection = $.sortDirection;
-        this.sortKey = $.sortKey;
+        this.sort = $.sort;
         this.tag = $.tag;
         this.tags = $.tags;
         this.visibility = $.visibility;
@@ -436,24 +428,17 @@ public Builder sizeMin(@Nullable Integer sizeMin) {
         }
 
         /**
-         * @param sortDirection Order the results in either `asc` or `desc`.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder sortDirection(@Nullable String sortDirection) {
-            $.sortDirection = sortDirection;
-            return this;
-        }
-
-        /**
-         * @param sortKey Sort images based on a certain key. Defaults to `name`.
+         * @param sort Sorts the response by one or more attribute and sort
+         * direction combinations. You can also set multiple sort keys and directions.
+         * Default direction is `desc`. Use the comma (,) character to separate
+         * multiple values. For example expression `sort = "name:asc,status"`
+         * sorts ascending by name and descending by status.
          * 
          * @return builder
          * 
          */
-        public Builder sortKey(@Nullable String sortKey) {
-            $.sortKey = sortKey;
+        public Builder sort(@Nullable String sort) {
+            $.sort = sort;
             return this;
         }
 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/ImageState.java b/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/ImageState.java
index 928c888e2..562dcc806 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/ImageState.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/images/inputs/ImageState.java
@@ -441,29 +441,6 @@ public Optional>> tags() {
         return Optional.ofNullable(this.tags);
     }
 
-    /**
-     * (**Deprecated** - use `updated_at` instead)
-     * 
-     * @deprecated
-     * Use updated_at instead
-     * 
-     */
-    @Deprecated /* Use updated_at instead */
-    @Import(name="updateAt")
-    private @Nullable Output updateAt;
-
-    /**
-     * @return (**Deprecated** - use `updated_at` instead)
-     * 
-     * @deprecated
-     * Use updated_at instead
-     * 
-     */
-    @Deprecated /* Use updated_at instead */
-    public Optional> updateAt() {
-        return Optional.ofNullable(this.updateAt);
-    }
-
     /**
      * The date the image was last updated.
      * 
@@ -564,7 +541,6 @@ private ImageState(ImageState $) {
         this.sizeBytes = $.sizeBytes;
         this.status = $.status;
         this.tags = $.tags;
-        this.updateAt = $.updateAt;
         this.updatedAt = $.updatedAt;
         this.verifyChecksum = $.verifyChecksum;
         this.visibility = $.visibility;
@@ -1167,35 +1143,6 @@ public Builder tags(String... tags) {
             return tags(List.of(tags));
         }
 
-        /**
-         * @param updateAt (**Deprecated** - use `updated_at` instead)
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use updated_at instead
-         * 
-         */
-        @Deprecated /* Use updated_at instead */
-        public Builder updateAt(@Nullable Output updateAt) {
-            $.updateAt = updateAt;
-            return this;
-        }
-
-        /**
-         * @param updateAt (**Deprecated** - use `updated_at` instead)
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use updated_at instead
-         * 
-         */
-        @Deprecated /* Use updated_at instead */
-        public Builder updateAt(String updateAt) {
-            return updateAt(Output.of(updateAt));
-        }
-
         /**
          * @param updatedAt The date the image was last updated.
          * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/images/outputs/GetImageIdsResult.java b/sdk/java/src/main/java/com/pulumi/openstack/images/outputs/GetImageIdsResult.java
index 2e54580b2..ce89612f3 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/images/outputs/GetImageIdsResult.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/images/outputs/GetImageIdsResult.java
@@ -31,20 +31,6 @@ public final class GetImageIdsResult {
     private @Nullable Integer sizeMax;
     private @Nullable Integer sizeMin;
     private @Nullable String sort;
-    /**
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    private @Nullable String sortDirection;
-    /**
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    private @Nullable String sortKey;
     private @Nullable String tag;
     private @Nullable List tags;
     private @Nullable String visibility;
@@ -87,24 +73,6 @@ public Optional sizeMin() {
     public Optional sort() {
         return Optional.ofNullable(this.sort);
     }
-    /**
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    public Optional sortDirection() {
-        return Optional.ofNullable(this.sortDirection);
-    }
-    /**
-     * @deprecated
-     * Use option 'sort' instead.
-     * 
-     */
-    @Deprecated /* Use option 'sort' instead. */
-    public Optional sortKey() {
-        return Optional.ofNullable(this.sortKey);
-    }
     public Optional tag() {
         return Optional.ofNullable(this.tag);
     }
@@ -135,8 +103,6 @@ public static final class Builder {
         private @Nullable Integer sizeMax;
         private @Nullable Integer sizeMin;
         private @Nullable String sort;
-        private @Nullable String sortDirection;
-        private @Nullable String sortKey;
         private @Nullable String tag;
         private @Nullable List tags;
         private @Nullable String visibility;
@@ -154,8 +120,6 @@ public Builder(GetImageIdsResult defaults) {
     	      this.sizeMax = defaults.sizeMax;
     	      this.sizeMin = defaults.sizeMin;
     	      this.sort = defaults.sort;
-    	      this.sortDirection = defaults.sortDirection;
-    	      this.sortKey = defaults.sortKey;
     	      this.tag = defaults.tag;
     	      this.tags = defaults.tags;
     	      this.visibility = defaults.visibility;
@@ -237,18 +201,6 @@ public Builder sort(@Nullable String sort) {
             return this;
         }
         @CustomType.Setter
-        public Builder sortDirection(@Nullable String sortDirection) {
-
-            this.sortDirection = sortDirection;
-            return this;
-        }
-        @CustomType.Setter
-        public Builder sortKey(@Nullable String sortKey) {
-
-            this.sortKey = sortKey;
-            return this;
-        }
-        @CustomType.Setter
         public Builder tag(@Nullable String tag) {
 
             this.tag = tag;
@@ -282,8 +234,6 @@ public GetImageIdsResult build() {
             _resultValue.sizeMax = sizeMax;
             _resultValue.sizeMin = sizeMin;
             _resultValue.sort = sort;
-            _resultValue.sortDirection = sortDirection;
-            _resultValue.sortKey = sortKey;
             _resultValue.tag = tag;
             _resultValue.tags = tags;
             _resultValue.visibility = visibility;
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/images/outputs/GetImageResult.java b/sdk/java/src/main/java/com/pulumi/openstack/images/outputs/GetImageResult.java
index 8fb99ce65..fe3924812 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/images/outputs/GetImageResult.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/images/outputs/GetImageResult.java
@@ -95,8 +95,7 @@ public final class GetImageResult {
     private Integer sizeBytes;
     private @Nullable Integer sizeMax;
     private @Nullable Integer sizeMin;
-    private @Nullable String sortDirection;
-    private @Nullable String sortKey;
+    private @Nullable String sort;
     private @Nullable String tag;
     /**
      * @return The tags list of the image.
@@ -233,11 +232,8 @@ public Optional sizeMax() {
     public Optional sizeMin() {
         return Optional.ofNullable(this.sizeMin);
     }
-    public Optional sortDirection() {
-        return Optional.ofNullable(this.sortDirection);
-    }
-    public Optional sortKey() {
-        return Optional.ofNullable(this.sortKey);
+    public Optional sort() {
+        return Optional.ofNullable(this.sort);
     }
     public Optional tag() {
         return Optional.ofNullable(this.tag);
@@ -291,8 +287,7 @@ public static final class Builder {
         private Integer sizeBytes;
         private @Nullable Integer sizeMax;
         private @Nullable Integer sizeMin;
-        private @Nullable String sortDirection;
-        private @Nullable String sortKey;
+        private @Nullable String sort;
         private @Nullable String tag;
         private List tags;
         private String updatedAt;
@@ -322,8 +317,7 @@ public Builder(GetImageResult defaults) {
     	      this.sizeBytes = defaults.sizeBytes;
     	      this.sizeMax = defaults.sizeMax;
     	      this.sizeMin = defaults.sizeMin;
-    	      this.sortDirection = defaults.sortDirection;
-    	      this.sortKey = defaults.sortKey;
+    	      this.sort = defaults.sort;
     	      this.tag = defaults.tag;
     	      this.tags = defaults.tags;
     	      this.updatedAt = defaults.updatedAt;
@@ -489,15 +483,9 @@ public Builder sizeMin(@Nullable Integer sizeMin) {
             return this;
         }
         @CustomType.Setter
-        public Builder sortDirection(@Nullable String sortDirection) {
-
-            this.sortDirection = sortDirection;
-            return this;
-        }
-        @CustomType.Setter
-        public Builder sortKey(@Nullable String sortKey) {
+        public Builder sort(@Nullable String sort) {
 
-            this.sortKey = sortKey;
+            this.sort = sort;
             return this;
         }
         @CustomType.Setter
@@ -555,8 +543,7 @@ public GetImageResult build() {
             _resultValue.sizeBytes = sizeBytes;
             _resultValue.sizeMax = sizeMax;
             _resultValue.sizeMin = sizeMin;
-            _resultValue.sortDirection = sortDirection;
-            _resultValue.sortKey = sortKey;
+            _resultValue.sort = sort;
             _resultValue.tag = tag;
             _resultValue.tags = tags;
             _resultValue.updatedAt = updatedAt;
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Listener.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Listener.java
index 99da08553..5a0479885 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Listener.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Listener.java
@@ -226,8 +226,8 @@ public Output name() {
     }
     /**
      * The protocol - can either be TCP, HTTP, HTTPS,
-     * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-     * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+     * TERMINATED_HTTPS, UDP, SCTP (supported only in
+     * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
      * **Octavia minor version >=2.25**). Changing this creates a new Listener.
      * 
      */
@@ -236,8 +236,8 @@ public Output name() {
 
     /**
      * @return The protocol - can either be TCP, HTTP, HTTPS,
-     * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-     * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+     * TERMINATED_HTTPS, UDP, SCTP (supported only in
+     * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
      * **Octavia minor version >=2.25**). Changing this creates a new Listener.
      * 
      */
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/ListenerArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/ListenerArgs.java
index ac6a03f55..0a9f6a9cf 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/ListenerArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/ListenerArgs.java
@@ -182,8 +182,8 @@ public Optional> name() {
 
     /**
      * The protocol - can either be TCP, HTTP, HTTPS,
-     * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-     * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+     * TERMINATED_HTTPS, UDP, SCTP (supported only in
+     * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
      * **Octavia minor version >=2.25**). Changing this creates a new Listener.
      * 
      */
@@ -192,8 +192,8 @@ public Optional> name() {
 
     /**
      * @return The protocol - can either be TCP, HTTP, HTTPS,
-     * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-     * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+     * TERMINATED_HTTPS, UDP, SCTP (supported only in
+     * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
      * **Octavia minor version >=2.25**). Changing this creates a new Listener.
      * 
      */
@@ -616,8 +616,8 @@ public Builder name(String name) {
 
         /**
          * @param protocol The protocol - can either be TCP, HTTP, HTTPS,
-         * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-         * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+         * TERMINATED_HTTPS, UDP, SCTP (supported only in
+         * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
          * **Octavia minor version >=2.25**). Changing this creates a new Listener.
          * 
          * @return builder
@@ -630,8 +630,8 @@ public Builder protocol(Output protocol) {
 
         /**
          * @param protocol The protocol - can either be TCP, HTTP, HTTPS,
-         * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-         * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+         * TERMINATED_HTTPS, UDP, SCTP (supported only in
+         * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
          * **Octavia minor version >=2.25**). Changing this creates a new Listener.
          * 
          * @return builder
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/LoadbalancerFunctions.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/LoadbalancerFunctions.java
new file mode 100644
index 000000000..3f4425464
--- /dev/null
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/LoadbalancerFunctions.java
@@ -0,0 +1,35 @@
+// *** WARNING: this file was generated by pulumi-java-gen. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+package com.pulumi.openstack.loadbalancer;
+
+import com.pulumi.core.Output;
+import com.pulumi.core.TypeShape;
+import com.pulumi.deployment.Deployment;
+import com.pulumi.deployment.InvokeOptions;
+import com.pulumi.openstack.Utilities;
+import com.pulumi.openstack.loadbalancer.inputs.GetFlavorV2Args;
+import com.pulumi.openstack.loadbalancer.inputs.GetFlavorV2PlainArgs;
+import com.pulumi.openstack.loadbalancer.outputs.GetFlavorV2Result;
+import java.util.concurrent.CompletableFuture;
+
+public final class LoadbalancerFunctions {
+    public static Output getFlavorV2() {
+        return getFlavorV2(GetFlavorV2Args.Empty, InvokeOptions.Empty);
+    }
+    public static CompletableFuture getFlavorV2Plain() {
+        return getFlavorV2Plain(GetFlavorV2PlainArgs.Empty, InvokeOptions.Empty);
+    }
+    public static Output getFlavorV2(GetFlavorV2Args args) {
+        return getFlavorV2(args, InvokeOptions.Empty);
+    }
+    public static CompletableFuture getFlavorV2Plain(GetFlavorV2PlainArgs args) {
+        return getFlavorV2Plain(args, InvokeOptions.Empty);
+    }
+    public static Output getFlavorV2(GetFlavorV2Args args, InvokeOptions options) {
+        return Deployment.getInstance().invoke("openstack:loadbalancer/getFlavorV2:getFlavorV2", TypeShape.of(GetFlavorV2Result.class), args, Utilities.withVersion(options));
+    }
+    public static CompletableFuture getFlavorV2Plain(GetFlavorV2PlainArgs args, InvokeOptions options) {
+        return Deployment.getInstance().invokeAsync("openstack:loadbalancer/getFlavorV2:getFlavorV2", TypeShape.of(GetFlavorV2Result.class), args, Utilities.withVersion(options));
+    }
+}
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Members.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Members.java
index 499fe1d7a..65f9c2bd0 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Members.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Members.java
@@ -22,10 +22,6 @@
  * > **Note:** This resource has attributes that depend on octavia minor versions.
  * Please ensure your Openstack cloud supports the required minor version.
  * 
- * > **Note:** This resource works only within Octavia API. For
- * legacy Neutron LBaaS v2 extension please use
- * openstack.loadbalancer.Member resource.
- * 
  * ## Example Usage
  * 
  * <!--Start PulumiCodeChooser -->
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Pool.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Pool.java
index 878f88aba..6912848e0 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Pool.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Pool.java
@@ -108,8 +108,7 @@ public Output> description() {
     /**
      * The load balancing algorithm to
      * distribute traffic to the pool's members. Must be one of
-     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-     * in Octavia).
+     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
      * 
      */
     @Export(name="lbMethod", refs={String.class}, tree="[0]")
@@ -118,8 +117,7 @@ public Output> description() {
     /**
      * @return The load balancing algorithm to
      * distribute traffic to the pool's members. Must be one of
-     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-     * in Octavia).
+     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
      * 
      */
     public Output lbMethod() {
@@ -195,8 +193,8 @@ public Output persistence() {
     }
     /**
      * The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-     * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-     * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+     * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+     * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
      * 
      */
     @Export(name="protocol", refs={String.class}, tree="[0]")
@@ -204,8 +202,8 @@ public Output persistence() {
 
     /**
      * @return The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-     * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-     * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+     * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+     * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
      * 
      */
     public Output protocol() {
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolArgs.java
index 4ffce55f8..4763e29b0 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolArgs.java
@@ -53,8 +53,7 @@ public Optional> description() {
     /**
      * The load balancing algorithm to
      * distribute traffic to the pool's members. Must be one of
-     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-     * in Octavia).
+     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
      * 
      */
     @Import(name="lbMethod", required=true)
@@ -63,8 +62,7 @@ public Optional> description() {
     /**
      * @return The load balancing algorithm to
      * distribute traffic to the pool's members. Must be one of
-     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-     * in Octavia).
+     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
      * 
      */
     public Output lbMethod() {
@@ -145,8 +143,8 @@ public Optional> persistence() {
 
     /**
      * The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-     * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-     * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+     * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+     * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
      * 
      */
     @Import(name="protocol", required=true)
@@ -154,8 +152,8 @@ public Optional> persistence() {
 
     /**
      * @return The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-     * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-     * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+     * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+     * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
      * 
      */
     public Output protocol() {
@@ -282,8 +280,7 @@ public Builder description(String description) {
         /**
          * @param lbMethod The load balancing algorithm to
          * distribute traffic to the pool's members. Must be one of
-         * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-         * in Octavia).
+         * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
          * 
          * @return builder
          * 
@@ -296,8 +293,7 @@ public Builder lbMethod(Output lbMethod) {
         /**
          * @param lbMethod The load balancing algorithm to
          * distribute traffic to the pool's members. Must be one of
-         * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-         * in Octavia).
+         * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
          * 
          * @return builder
          * 
@@ -404,8 +400,8 @@ public Builder persistence(PoolPersistenceArgs persistence) {
 
         /**
          * @param protocol The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-         * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-         * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+         * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+         * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
          * 
          * @return builder
          * 
@@ -417,8 +413,8 @@ public Builder protocol(Output protocol) {
 
         /**
          * @param protocol The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-         * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-         * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+         * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+         * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
          * 
          * @return builder
          * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolV1.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolV1.java
index 583a34472..031b5fd6f 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolV1.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolV1.java
@@ -63,10 +63,6 @@
  * <!--Start PulumiCodeChooser -->
  * <!--End PulumiCodeChooser -->
  * 
- * ## Notes
- * 
- * The `member` block is deprecated in favor of the `openstack.loadbalancer.MemberV1` resource.
- * 
  * ## Import
  * 
  * Load Balancer Pools can be imported using the `id`, e.g.
@@ -112,30 +108,6 @@ public Output lbMethod() {
     public Output lbProvider() {
         return this.lbProvider;
     }
-    /**
-     * An existing node to add to the pool. Changing this
-     * updates the members of the pool. The member object structure is documented
-     * below. Please note that the `member` block is deprecated in favor of the
-     * `openstack.loadbalancer.MemberV1` resource.
-     * 
-     * @deprecated
-     * Use openstack.loadbalancer.MemberV1 instead
-     * 
-     */
-    @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-    @Export(name="members", refs={List.class,String.class}, tree="[0,1]")
-    private Output> members;
-
-    /**
-     * @return An existing node to add to the pool. Changing this
-     * updates the members of the pool. The member object structure is documented
-     * below. Please note that the `member` block is deprecated in favor of the
-     * `openstack.loadbalancer.MemberV1` resource.
-     * 
-     */
-    public Output>> members() {
-        return Codegen.optional(this.members);
-    }
     /**
      * A list of IDs of monitors to associate with the
      * pool.
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolV1Args.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolV1Args.java
index bed3e7fb7..4812e9553 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolV1Args.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/PoolV1Args.java
@@ -53,35 +53,6 @@ public Optional> lbProvider() {
         return Optional.ofNullable(this.lbProvider);
     }
 
-    /**
-     * An existing node to add to the pool. Changing this
-     * updates the members of the pool. The member object structure is documented
-     * below. Please note that the `member` block is deprecated in favor of the
-     * `openstack.loadbalancer.MemberV1` resource.
-     * 
-     * @deprecated
-     * Use openstack.loadbalancer.MemberV1 instead
-     * 
-     */
-    @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-    @Import(name="members")
-    private @Nullable Output> members;
-
-    /**
-     * @return An existing node to add to the pool. Changing this
-     * updates the members of the pool. The member object structure is documented
-     * below. Please note that the `member` block is deprecated in favor of the
-     * `openstack.loadbalancer.MemberV1` resource.
-     * 
-     * @deprecated
-     * Use openstack.loadbalancer.MemberV1 instead
-     * 
-     */
-    @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-    public Optional>> members() {
-        return Optional.ofNullable(this.members);
-    }
-
     /**
      * A list of IDs of monitors to associate with the
      * pool.
@@ -195,7 +166,6 @@ private PoolV1Args() {}
     private PoolV1Args(PoolV1Args $) {
         this.lbMethod = $.lbMethod;
         this.lbProvider = $.lbProvider;
-        this.members = $.members;
         this.monitorIds = $.monitorIds;
         this.name = $.name;
         this.protocol = $.protocol;
@@ -270,58 +240,6 @@ public Builder lbProvider(String lbProvider) {
             return lbProvider(Output.of(lbProvider));
         }
 
-        /**
-         * @param members An existing node to add to the pool. Changing this
-         * updates the members of the pool. The member object structure is documented
-         * below. Please note that the `member` block is deprecated in favor of the
-         * `openstack.loadbalancer.MemberV1` resource.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.loadbalancer.MemberV1 instead
-         * 
-         */
-        @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-        public Builder members(@Nullable Output> members) {
-            $.members = members;
-            return this;
-        }
-
-        /**
-         * @param members An existing node to add to the pool. Changing this
-         * updates the members of the pool. The member object structure is documented
-         * below. Please note that the `member` block is deprecated in favor of the
-         * `openstack.loadbalancer.MemberV1` resource.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.loadbalancer.MemberV1 instead
-         * 
-         */
-        @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-        public Builder members(List members) {
-            return members(Output.of(members));
-        }
-
-        /**
-         * @param members An existing node to add to the pool. Changing this
-         * updates the members of the pool. The member object structure is documented
-         * below. Please note that the `member` block is deprecated in favor of the
-         * `openstack.loadbalancer.MemberV1` resource.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.loadbalancer.MemberV1 instead
-         * 
-         */
-        @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-        public Builder members(String... members) {
-            return members(List.of(members));
-        }
-
         /**
          * @param monitorIds A list of IDs of monitors to associate with the
          * pool.
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Quota.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Quota.java
index 86c0114c1..cf5758802 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Quota.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/Quota.java
@@ -19,8 +19,6 @@
  * 
  * > **Note:** This usually requires admin privileges.
  * 
- * > **Note:** This resource is only available for Octavia.
- * 
  * > **Note:** This resource has a no-op deletion so no actual actions will be done against the OpenStack
  *    API in case of delete call.
  * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/GetFlavorV2Args.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/GetFlavorV2Args.java
new file mode 100644
index 000000000..0fd4411ba
--- /dev/null
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/GetFlavorV2Args.java
@@ -0,0 +1,97 @@
+// *** WARNING: this file was generated by pulumi-java-gen. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+package com.pulumi.openstack.loadbalancer.inputs;
+
+import com.pulumi.core.Output;
+import com.pulumi.core.annotations.Import;
+import java.lang.String;
+import java.util.Objects;
+import java.util.Optional;
+import javax.annotation.Nullable;
+
+
+public final class GetFlavorV2Args extends com.pulumi.resources.InvokeArgs {
+
+    public static final GetFlavorV2Args Empty = new GetFlavorV2Args();
+
+    @Import(name="flavorId")
+    private @Nullable Output flavorId;
+
+    public Optional> flavorId() {
+        return Optional.ofNullable(this.flavorId);
+    }
+
+    @Import(name="name")
+    private @Nullable Output name;
+
+    public Optional> name() {
+        return Optional.ofNullable(this.name);
+    }
+
+    @Import(name="region")
+    private @Nullable Output region;
+
+    public Optional> region() {
+        return Optional.ofNullable(this.region);
+    }
+
+    private GetFlavorV2Args() {}
+
+    private GetFlavorV2Args(GetFlavorV2Args $) {
+        this.flavorId = $.flavorId;
+        this.name = $.name;
+        this.region = $.region;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+    public static Builder builder(GetFlavorV2Args defaults) {
+        return new Builder(defaults);
+    }
+
+    public static final class Builder {
+        private GetFlavorV2Args $;
+
+        public Builder() {
+            $ = new GetFlavorV2Args();
+        }
+
+        public Builder(GetFlavorV2Args defaults) {
+            $ = new GetFlavorV2Args(Objects.requireNonNull(defaults));
+        }
+
+        public Builder flavorId(@Nullable Output flavorId) {
+            $.flavorId = flavorId;
+            return this;
+        }
+
+        public Builder flavorId(String flavorId) {
+            return flavorId(Output.of(flavorId));
+        }
+
+        public Builder name(@Nullable Output name) {
+            $.name = name;
+            return this;
+        }
+
+        public Builder name(String name) {
+            return name(Output.of(name));
+        }
+
+        public Builder region(@Nullable Output region) {
+            $.region = region;
+            return this;
+        }
+
+        public Builder region(String region) {
+            return region(Output.of(region));
+        }
+
+        public GetFlavorV2Args build() {
+            return $;
+        }
+    }
+
+}
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/GetFlavorV2PlainArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/GetFlavorV2PlainArgs.java
new file mode 100644
index 000000000..a7c9cccde
--- /dev/null
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/GetFlavorV2PlainArgs.java
@@ -0,0 +1,84 @@
+// *** WARNING: this file was generated by pulumi-java-gen. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+package com.pulumi.openstack.loadbalancer.inputs;
+
+import com.pulumi.core.annotations.Import;
+import java.lang.String;
+import java.util.Objects;
+import java.util.Optional;
+import javax.annotation.Nullable;
+
+
+public final class GetFlavorV2PlainArgs extends com.pulumi.resources.InvokeArgs {
+
+    public static final GetFlavorV2PlainArgs Empty = new GetFlavorV2PlainArgs();
+
+    @Import(name="flavorId")
+    private @Nullable String flavorId;
+
+    public Optional flavorId() {
+        return Optional.ofNullable(this.flavorId);
+    }
+
+    @Import(name="name")
+    private @Nullable String name;
+
+    public Optional name() {
+        return Optional.ofNullable(this.name);
+    }
+
+    @Import(name="region")
+    private @Nullable String region;
+
+    public Optional region() {
+        return Optional.ofNullable(this.region);
+    }
+
+    private GetFlavorV2PlainArgs() {}
+
+    private GetFlavorV2PlainArgs(GetFlavorV2PlainArgs $) {
+        this.flavorId = $.flavorId;
+        this.name = $.name;
+        this.region = $.region;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+    public static Builder builder(GetFlavorV2PlainArgs defaults) {
+        return new Builder(defaults);
+    }
+
+    public static final class Builder {
+        private GetFlavorV2PlainArgs $;
+
+        public Builder() {
+            $ = new GetFlavorV2PlainArgs();
+        }
+
+        public Builder(GetFlavorV2PlainArgs defaults) {
+            $ = new GetFlavorV2PlainArgs(Objects.requireNonNull(defaults));
+        }
+
+        public Builder flavorId(@Nullable String flavorId) {
+            $.flavorId = flavorId;
+            return this;
+        }
+
+        public Builder name(@Nullable String name) {
+            $.name = name;
+            return this;
+        }
+
+        public Builder region(@Nullable String region) {
+            $.region = region;
+            return this;
+        }
+
+        public GetFlavorV2PlainArgs build() {
+            return $;
+        }
+    }
+
+}
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/ListenerState.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/ListenerState.java
index 5bbc4a70b..43f9ea3ae 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/ListenerState.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/ListenerState.java
@@ -181,8 +181,8 @@ public Optional> name() {
 
     /**
      * The protocol - can either be TCP, HTTP, HTTPS,
-     * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-     * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+     * TERMINATED_HTTPS, UDP, SCTP (supported only in
+     * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
      * **Octavia minor version >=2.25**). Changing this creates a new Listener.
      * 
      */
@@ -191,8 +191,8 @@ public Optional> name() {
 
     /**
      * @return The protocol - can either be TCP, HTTP, HTTPS,
-     * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-     * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+     * TERMINATED_HTTPS, UDP, SCTP (supported only in
+     * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
      * **Octavia minor version >=2.25**). Changing this creates a new Listener.
      * 
      */
@@ -615,8 +615,8 @@ public Builder name(String name) {
 
         /**
          * @param protocol The protocol - can either be TCP, HTTP, HTTPS,
-         * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-         * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+         * TERMINATED_HTTPS, UDP, SCTP (supported only in
+         * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
          * **Octavia minor version >=2.25**). Changing this creates a new Listener.
          * 
          * @return builder
@@ -629,8 +629,8 @@ public Builder protocol(@Nullable Output protocol) {
 
         /**
          * @param protocol The protocol - can either be TCP, HTTP, HTTPS,
-         * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-         * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+         * TERMINATED_HTTPS, UDP, SCTP (supported only in
+         * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
          * **Octavia minor version >=2.25**). Changing this creates a new Listener.
          * 
          * @return builder
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/PoolState.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/PoolState.java
index 65fcf091b..23a4eaf1b 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/PoolState.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/PoolState.java
@@ -52,8 +52,7 @@ public Optional> description() {
     /**
      * The load balancing algorithm to
      * distribute traffic to the pool's members. Must be one of
-     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-     * in Octavia).
+     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
      * 
      */
     @Import(name="lbMethod")
@@ -62,8 +61,7 @@ public Optional> description() {
     /**
      * @return The load balancing algorithm to
      * distribute traffic to the pool's members. Must be one of
-     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-     * in Octavia).
+     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
      * 
      */
     public Optional> lbMethod() {
@@ -144,8 +142,8 @@ public Optional> persistence() {
 
     /**
      * The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-     * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-     * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+     * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+     * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
      * 
      */
     @Import(name="protocol")
@@ -153,8 +151,8 @@ public Optional> persistence() {
 
     /**
      * @return The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-     * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-     * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+     * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+     * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
      * 
      */
     public Optional> protocol() {
@@ -281,8 +279,7 @@ public Builder description(String description) {
         /**
          * @param lbMethod The load balancing algorithm to
          * distribute traffic to the pool's members. Must be one of
-         * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-         * in Octavia).
+         * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
          * 
          * @return builder
          * 
@@ -295,8 +292,7 @@ public Builder lbMethod(@Nullable Output lbMethod) {
         /**
          * @param lbMethod The load balancing algorithm to
          * distribute traffic to the pool's members. Must be one of
-         * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-         * in Octavia).
+         * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
          * 
          * @return builder
          * 
@@ -403,8 +399,8 @@ public Builder persistence(PoolPersistenceArgs persistence) {
 
         /**
          * @param protocol The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-         * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-         * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+         * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+         * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
          * 
          * @return builder
          * 
@@ -416,8 +412,8 @@ public Builder protocol(@Nullable Output protocol) {
 
         /**
          * @param protocol The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-         * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-         * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+         * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+         * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
          * 
          * @return builder
          * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/PoolV1State.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/PoolV1State.java
index e615fed64..4235134df 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/PoolV1State.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/inputs/PoolV1State.java
@@ -52,35 +52,6 @@ public Optional> lbProvider() {
         return Optional.ofNullable(this.lbProvider);
     }
 
-    /**
-     * An existing node to add to the pool. Changing this
-     * updates the members of the pool. The member object structure is documented
-     * below. Please note that the `member` block is deprecated in favor of the
-     * `openstack.loadbalancer.MemberV1` resource.
-     * 
-     * @deprecated
-     * Use openstack.loadbalancer.MemberV1 instead
-     * 
-     */
-    @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-    @Import(name="members")
-    private @Nullable Output> members;
-
-    /**
-     * @return An existing node to add to the pool. Changing this
-     * updates the members of the pool. The member object structure is documented
-     * below. Please note that the `member` block is deprecated in favor of the
-     * `openstack.loadbalancer.MemberV1` resource.
-     * 
-     * @deprecated
-     * Use openstack.loadbalancer.MemberV1 instead
-     * 
-     */
-    @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-    public Optional>> members() {
-        return Optional.ofNullable(this.members);
-    }
-
     /**
      * A list of IDs of monitors to associate with the
      * pool.
@@ -194,7 +165,6 @@ private PoolV1State() {}
     private PoolV1State(PoolV1State $) {
         this.lbMethod = $.lbMethod;
         this.lbProvider = $.lbProvider;
-        this.members = $.members;
         this.monitorIds = $.monitorIds;
         this.name = $.name;
         this.protocol = $.protocol;
@@ -269,58 +239,6 @@ public Builder lbProvider(String lbProvider) {
             return lbProvider(Output.of(lbProvider));
         }
 
-        /**
-         * @param members An existing node to add to the pool. Changing this
-         * updates the members of the pool. The member object structure is documented
-         * below. Please note that the `member` block is deprecated in favor of the
-         * `openstack.loadbalancer.MemberV1` resource.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.loadbalancer.MemberV1 instead
-         * 
-         */
-        @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-        public Builder members(@Nullable Output> members) {
-            $.members = members;
-            return this;
-        }
-
-        /**
-         * @param members An existing node to add to the pool. Changing this
-         * updates the members of the pool. The member object structure is documented
-         * below. Please note that the `member` block is deprecated in favor of the
-         * `openstack.loadbalancer.MemberV1` resource.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.loadbalancer.MemberV1 instead
-         * 
-         */
-        @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-        public Builder members(List members) {
-            return members(Output.of(members));
-        }
-
-        /**
-         * @param members An existing node to add to the pool. Changing this
-         * updates the members of the pool. The member object structure is documented
-         * below. Please note that the `member` block is deprecated in favor of the
-         * `openstack.loadbalancer.MemberV1` resource.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.loadbalancer.MemberV1 instead
-         * 
-         */
-        @Deprecated /* Use openstack.loadbalancer.MemberV1 instead */
-        public Builder members(String... members) {
-            return members(List.of(members));
-        }
-
         /**
          * @param monitorIds A list of IDs of monitors to associate with the
          * pool.
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/outputs/GetFlavorV2Result.java b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/outputs/GetFlavorV2Result.java
new file mode 100644
index 000000000..33e0561c7
--- /dev/null
+++ b/sdk/java/src/main/java/com/pulumi/openstack/loadbalancer/outputs/GetFlavorV2Result.java
@@ -0,0 +1,149 @@
+// *** WARNING: this file was generated by pulumi-java-gen. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+package com.pulumi.openstack.loadbalancer.outputs;
+
+import com.pulumi.core.annotations.CustomType;
+import com.pulumi.exceptions.MissingRequiredPropertyException;
+import java.lang.Boolean;
+import java.lang.String;
+import java.util.Objects;
+import java.util.Optional;
+import javax.annotation.Nullable;
+
+@CustomType
+public final class GetFlavorV2Result {
+    private String description;
+    private Boolean enabled;
+    private String flavorId;
+    private String flavorProfileId;
+    /**
+     * @return The provider-assigned unique ID for this managed resource.
+     * 
+     */
+    private String id;
+    private String name;
+    private @Nullable String region;
+
+    private GetFlavorV2Result() {}
+    public String description() {
+        return this.description;
+    }
+    public Boolean enabled() {
+        return this.enabled;
+    }
+    public String flavorId() {
+        return this.flavorId;
+    }
+    public String flavorProfileId() {
+        return this.flavorProfileId;
+    }
+    /**
+     * @return The provider-assigned unique ID for this managed resource.
+     * 
+     */
+    public String id() {
+        return this.id;
+    }
+    public String name() {
+        return this.name;
+    }
+    public Optional region() {
+        return Optional.ofNullable(this.region);
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static Builder builder(GetFlavorV2Result defaults) {
+        return new Builder(defaults);
+    }
+    @CustomType.Builder
+    public static final class Builder {
+        private String description;
+        private Boolean enabled;
+        private String flavorId;
+        private String flavorProfileId;
+        private String id;
+        private String name;
+        private @Nullable String region;
+        public Builder() {}
+        public Builder(GetFlavorV2Result defaults) {
+    	      Objects.requireNonNull(defaults);
+    	      this.description = defaults.description;
+    	      this.enabled = defaults.enabled;
+    	      this.flavorId = defaults.flavorId;
+    	      this.flavorProfileId = defaults.flavorProfileId;
+    	      this.id = defaults.id;
+    	      this.name = defaults.name;
+    	      this.region = defaults.region;
+        }
+
+        @CustomType.Setter
+        public Builder description(String description) {
+            if (description == null) {
+              throw new MissingRequiredPropertyException("GetFlavorV2Result", "description");
+            }
+            this.description = description;
+            return this;
+        }
+        @CustomType.Setter
+        public Builder enabled(Boolean enabled) {
+            if (enabled == null) {
+              throw new MissingRequiredPropertyException("GetFlavorV2Result", "enabled");
+            }
+            this.enabled = enabled;
+            return this;
+        }
+        @CustomType.Setter
+        public Builder flavorId(String flavorId) {
+            if (flavorId == null) {
+              throw new MissingRequiredPropertyException("GetFlavorV2Result", "flavorId");
+            }
+            this.flavorId = flavorId;
+            return this;
+        }
+        @CustomType.Setter
+        public Builder flavorProfileId(String flavorProfileId) {
+            if (flavorProfileId == null) {
+              throw new MissingRequiredPropertyException("GetFlavorV2Result", "flavorProfileId");
+            }
+            this.flavorProfileId = flavorProfileId;
+            return this;
+        }
+        @CustomType.Setter
+        public Builder id(String id) {
+            if (id == null) {
+              throw new MissingRequiredPropertyException("GetFlavorV2Result", "id");
+            }
+            this.id = id;
+            return this;
+        }
+        @CustomType.Setter
+        public Builder name(String name) {
+            if (name == null) {
+              throw new MissingRequiredPropertyException("GetFlavorV2Result", "name");
+            }
+            this.name = name;
+            return this;
+        }
+        @CustomType.Setter
+        public Builder region(@Nullable String region) {
+
+            this.region = region;
+            return this;
+        }
+        public GetFlavorV2Result build() {
+            final var _resultValue = new GetFlavorV2Result();
+            _resultValue.description = description;
+            _resultValue.enabled = enabled;
+            _resultValue.flavorId = flavorId;
+            _resultValue.flavorProfileId = flavorProfileId;
+            _resultValue.id = id;
+            _resultValue.name = name;
+            _resultValue.region = region;
+            return _resultValue;
+        }
+    }
+}
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/Router.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/Router.java
index 14d0de919..1b12e465d 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/Router.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/Router.java
@@ -199,32 +199,6 @@ public Output enableSnat() {
     public Output> externalFixedIps() {
         return this.externalFixedIps;
     }
-    /**
-     * The
-     * network UUID of an external gateway for the router. A router with an
-     * external gateway is required if any compute instances or load balancers
-     * will be using floating IPs. Changing this updates the external gateway
-     * of an existing router.
-     * 
-     * @deprecated
-     * use external_network_id instead
-     * 
-     */
-    @Deprecated /* use external_network_id instead */
-    @Export(name="externalGateway", refs={String.class}, tree="[0]")
-    private Output externalGateway;
-
-    /**
-     * @return The
-     * network UUID of an external gateway for the router. A router with an
-     * external gateway is required if any compute instances or load balancers
-     * will be using floating IPs. Changing this updates the external gateway
-     * of an existing router.
-     * 
-     */
-    public Output externalGateway() {
-        return this.externalGateway;
-    }
     /**
      * The network UUID of an external gateway
      * for the router. A router with an external gateway is required if any
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/RouterArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/RouterArgs.java
index 551010dcf..e3bc846b9 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/RouterArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/RouterArgs.java
@@ -139,37 +139,6 @@ public Optional>> externalFixedIps() {
         return Optional.ofNullable(this.externalFixedIps);
     }
 
-    /**
-     * The
-     * network UUID of an external gateway for the router. A router with an
-     * external gateway is required if any compute instances or load balancers
-     * will be using floating IPs. Changing this updates the external gateway
-     * of an existing router.
-     * 
-     * @deprecated
-     * use external_network_id instead
-     * 
-     */
-    @Deprecated /* use external_network_id instead */
-    @Import(name="externalGateway")
-    private @Nullable Output externalGateway;
-
-    /**
-     * @return The
-     * network UUID of an external gateway for the router. A router with an
-     * external gateway is required if any compute instances or load balancers
-     * will be using floating IPs. Changing this updates the external gateway
-     * of an existing router.
-     * 
-     * @deprecated
-     * use external_network_id instead
-     * 
-     */
-    @Deprecated /* use external_network_id instead */
-    public Optional> externalGateway() {
-        return Optional.ofNullable(this.externalGateway);
-    }
-
     /**
      * The network UUID of an external gateway
      * for the router. A router with an external gateway is required if any
@@ -325,7 +294,6 @@ private RouterArgs(RouterArgs $) {
         this.distributed = $.distributed;
         this.enableSnat = $.enableSnat;
         this.externalFixedIps = $.externalFixedIps;
-        this.externalGateway = $.externalGateway;
         this.externalNetworkId = $.externalNetworkId;
         this.externalSubnetIds = $.externalSubnetIds;
         this.name = $.name;
@@ -534,43 +502,6 @@ public Builder externalFixedIps(RouterExternalFixedIpArgs... externalFixedIps) {
             return externalFixedIps(List.of(externalFixedIps));
         }
 
-        /**
-         * @param externalGateway The
-         * network UUID of an external gateway for the router. A router with an
-         * external gateway is required if any compute instances or load balancers
-         * will be using floating IPs. Changing this updates the external gateway
-         * of an existing router.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * use external_network_id instead
-         * 
-         */
-        @Deprecated /* use external_network_id instead */
-        public Builder externalGateway(@Nullable Output externalGateway) {
-            $.externalGateway = externalGateway;
-            return this;
-        }
-
-        /**
-         * @param externalGateway The
-         * network UUID of an external gateway for the router. A router with an
-         * external gateway is required if any compute instances or load balancers
-         * will be using floating IPs. Changing this updates the external gateway
-         * of an existing router.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * use external_network_id instead
-         * 
-         */
-        @Deprecated /* use external_network_id instead */
-        public Builder externalGateway(String externalGateway) {
-            return externalGateway(Output.of(externalGateway));
-        }
-
         /**
          * @param externalNetworkId The network UUID of an external gateway
          * for the router. A router with an external gateway is required if any
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/Subnet.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/Subnet.java
index 5a3de40ac..439b5cdc3 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/Subnet.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/Subnet.java
@@ -11,8 +11,6 @@
 import com.pulumi.openstack.networking.SubnetArgs;
 import com.pulumi.openstack.networking.inputs.SubnetState;
 import com.pulumi.openstack.networking.outputs.SubnetAllocationPool;
-import com.pulumi.openstack.networking.outputs.SubnetAllocationPoolsCollection;
-import com.pulumi.openstack.networking.outputs.SubnetHostRoute;
 import java.lang.Boolean;
 import java.lang.Integer;
 import java.lang.Object;
@@ -119,28 +117,6 @@ public Output> allTags() {
     public Output> allocationPools() {
         return this.allocationPools;
     }
-    /**
-     * A block declaring the start and end range of the IP addresses available for
-     * use with DHCP in this subnet.
-     * The `allocation_pools` block is documented below.
-     * 
-     * @deprecated
-     * use allocation_pool instead
-     * 
-     */
-    @Deprecated /* use allocation_pool instead */
-    @Export(name="allocationPoolsCollection", refs={List.class,SubnetAllocationPoolsCollection.class}, tree="[0,1]")
-    private Output> allocationPoolsCollection;
-
-    /**
-     * @return A block declaring the start and end range of the IP addresses available for
-     * use with DHCP in this subnet.
-     * The `allocation_pools` block is documented below.
-     * 
-     */
-    public Output> allocationPoolsCollection() {
-        return this.allocationPoolsCollection;
-    }
     /**
      * CIDR representing IP range for this subnet, based on IP
      * version. You can omit this option if you are creating a subnet from a
@@ -231,32 +207,6 @@ public Output> enableDhcp() {
     public Output gatewayIp() {
         return this.gatewayIp;
     }
-    /**
-     * (**Deprecated** - use `openstack.networking.SubnetRoute`
-     * instead) An array of routes that should be used by devices
-     * with IPs from this subnet (not including local subnet route). The host_route
-     * object structure is documented below. Changing this updates the host routes
-     * for the existing subnet.
-     * 
-     * @deprecated
-     * Use openstack.networking.SubnetRoute instead
-     * 
-     */
-    @Deprecated /* Use openstack.networking.SubnetRoute instead */
-    @Export(name="hostRoutes", refs={List.class,SubnetHostRoute.class}, tree="[0,1]")
-    private Output> hostRoutes;
-
-    /**
-     * @return (**Deprecated** - use `openstack.networking.SubnetRoute`
-     * instead) An array of routes that should be used by devices
-     * with IPs from this subnet (not including local subnet route). The host_route
-     * object structure is documented below. Changing this updates the host routes
-     * for the existing subnet.
-     * 
-     */
-    public Output>> hostRoutes() {
-        return Codegen.optional(this.hostRoutes);
-    }
     /**
      * IP version, either 4 (default) or 6. Changing this creates a
      * new subnet.
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/SubnetArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/SubnetArgs.java
index 0c130bc84..996bcc4b0 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/SubnetArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/SubnetArgs.java
@@ -7,8 +7,6 @@
 import com.pulumi.core.annotations.Import;
 import com.pulumi.exceptions.MissingRequiredPropertyException;
 import com.pulumi.openstack.networking.inputs.SubnetAllocationPoolArgs;
-import com.pulumi.openstack.networking.inputs.SubnetAllocationPoolsCollectionArgs;
-import com.pulumi.openstack.networking.inputs.SubnetHostRouteArgs;
 import java.lang.Boolean;
 import java.lang.Integer;
 import java.lang.Object;
@@ -49,33 +47,6 @@ public Optional>> allocationPools() {
         return Optional.ofNullable(this.allocationPools);
     }
 
-    /**
-     * A block declaring the start and end range of the IP addresses available for
-     * use with DHCP in this subnet.
-     * The `allocation_pools` block is documented below.
-     * 
-     * @deprecated
-     * use allocation_pool instead
-     * 
-     */
-    @Deprecated /* use allocation_pool instead */
-    @Import(name="allocationPoolsCollection")
-    private @Nullable Output> allocationPoolsCollection;
-
-    /**
-     * @return A block declaring the start and end range of the IP addresses available for
-     * use with DHCP in this subnet.
-     * The `allocation_pools` block is documented below.
-     * 
-     * @deprecated
-     * use allocation_pool instead
-     * 
-     */
-    @Deprecated /* use allocation_pool instead */
-    public Optional>> allocationPoolsCollection() {
-        return Optional.ofNullable(this.allocationPoolsCollection);
-    }
-
     /**
      * CIDR representing IP range for this subnet, based on IP
      * version. You can omit this option if you are creating a subnet from a
@@ -171,37 +142,6 @@ public Optional> gatewayIp() {
         return Optional.ofNullable(this.gatewayIp);
     }
 
-    /**
-     * (**Deprecated** - use `openstack.networking.SubnetRoute`
-     * instead) An array of routes that should be used by devices
-     * with IPs from this subnet (not including local subnet route). The host_route
-     * object structure is documented below. Changing this updates the host routes
-     * for the existing subnet.
-     * 
-     * @deprecated
-     * Use openstack.networking.SubnetRoute instead
-     * 
-     */
-    @Deprecated /* Use openstack.networking.SubnetRoute instead */
-    @Import(name="hostRoutes")
-    private @Nullable Output> hostRoutes;
-
-    /**
-     * @return (**Deprecated** - use `openstack.networking.SubnetRoute`
-     * instead) An array of routes that should be used by devices
-     * with IPs from this subnet (not including local subnet route). The host_route
-     * object structure is documented below. Changing this updates the host routes
-     * for the existing subnet.
-     * 
-     * @deprecated
-     * Use openstack.networking.SubnetRoute instead
-     * 
-     */
-    @Deprecated /* Use openstack.networking.SubnetRoute instead */
-    public Optional>> hostRoutes() {
-        return Optional.ofNullable(this.hostRoutes);
-    }
-
     /**
      * IP version, either 4 (default) or 6. Changing this creates a
      * new subnet.
@@ -429,13 +369,11 @@ private SubnetArgs() {}
 
     private SubnetArgs(SubnetArgs $) {
         this.allocationPools = $.allocationPools;
-        this.allocationPoolsCollection = $.allocationPoolsCollection;
         this.cidr = $.cidr;
         this.description = $.description;
         this.dnsNameservers = $.dnsNameservers;
         this.enableDhcp = $.enableDhcp;
         this.gatewayIp = $.gatewayIp;
-        this.hostRoutes = $.hostRoutes;
         this.ipVersion = $.ipVersion;
         this.ipv6AddressMode = $.ipv6AddressMode;
         this.ipv6RaMode = $.ipv6RaMode;
@@ -515,55 +453,6 @@ public Builder allocationPools(SubnetAllocationPoolArgs... allocationPools) {
             return allocationPools(List.of(allocationPools));
         }
 
-        /**
-         * @param allocationPoolsCollection A block declaring the start and end range of the IP addresses available for
-         * use with DHCP in this subnet.
-         * The `allocation_pools` block is documented below.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * use allocation_pool instead
-         * 
-         */
-        @Deprecated /* use allocation_pool instead */
-        public Builder allocationPoolsCollection(@Nullable Output> allocationPoolsCollection) {
-            $.allocationPoolsCollection = allocationPoolsCollection;
-            return this;
-        }
-
-        /**
-         * @param allocationPoolsCollection A block declaring the start and end range of the IP addresses available for
-         * use with DHCP in this subnet.
-         * The `allocation_pools` block is documented below.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * use allocation_pool instead
-         * 
-         */
-        @Deprecated /* use allocation_pool instead */
-        public Builder allocationPoolsCollection(List allocationPoolsCollection) {
-            return allocationPoolsCollection(Output.of(allocationPoolsCollection));
-        }
-
-        /**
-         * @param allocationPoolsCollection A block declaring the start and end range of the IP addresses available for
-         * use with DHCP in this subnet.
-         * The `allocation_pools` block is documented below.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * use allocation_pool instead
-         * 
-         */
-        @Deprecated /* use allocation_pool instead */
-        public Builder allocationPoolsCollection(SubnetAllocationPoolsCollectionArgs... allocationPoolsCollection) {
-            return allocationPoolsCollection(List.of(allocationPoolsCollection));
-        }
-
         /**
          * @param cidr CIDR representing IP range for this subnet, based on IP
          * version. You can omit this option if you are creating a subnet from a
@@ -701,61 +590,6 @@ public Builder gatewayIp(String gatewayIp) {
             return gatewayIp(Output.of(gatewayIp));
         }
 
-        /**
-         * @param hostRoutes (**Deprecated** - use `openstack.networking.SubnetRoute`
-         * instead) An array of routes that should be used by devices
-         * with IPs from this subnet (not including local subnet route). The host_route
-         * object structure is documented below. Changing this updates the host routes
-         * for the existing subnet.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.networking.SubnetRoute instead
-         * 
-         */
-        @Deprecated /* Use openstack.networking.SubnetRoute instead */
-        public Builder hostRoutes(@Nullable Output> hostRoutes) {
-            $.hostRoutes = hostRoutes;
-            return this;
-        }
-
-        /**
-         * @param hostRoutes (**Deprecated** - use `openstack.networking.SubnetRoute`
-         * instead) An array of routes that should be used by devices
-         * with IPs from this subnet (not including local subnet route). The host_route
-         * object structure is documented below. Changing this updates the host routes
-         * for the existing subnet.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.networking.SubnetRoute instead
-         * 
-         */
-        @Deprecated /* Use openstack.networking.SubnetRoute instead */
-        public Builder hostRoutes(List hostRoutes) {
-            return hostRoutes(Output.of(hostRoutes));
-        }
-
-        /**
-         * @param hostRoutes (**Deprecated** - use `openstack.networking.SubnetRoute`
-         * instead) An array of routes that should be used by devices
-         * with IPs from this subnet (not including local subnet route). The host_route
-         * object structure is documented below. Changing this updates the host routes
-         * for the existing subnet.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.networking.SubnetRoute instead
-         * 
-         */
-        @Deprecated /* Use openstack.networking.SubnetRoute instead */
-        public Builder hostRoutes(SubnetHostRouteArgs... hostRoutes) {
-            return hostRoutes(List.of(hostRoutes));
-        }
-
         /**
          * @param ipVersion IP version, either 4 (default) or 6. Changing this creates a
          * new subnet.
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetFloatingIpArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetFloatingIpArgs.java
index 2d6223e01..1b9068201 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetFloatingIpArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetFloatingIpArgs.java
@@ -62,14 +62,14 @@ public Optional> fixedIp() {
     }
 
     /**
-     * The name of the pool from which the floating IP belongs to.
+     * The ID of the network from which the floating IP belongs to.
      * 
      */
     @Import(name="pool")
     private @Nullable Output pool;
 
     /**
-     * @return The name of the pool from which the floating IP belongs to.
+     * @return The ID of the network from which the floating IP belongs to.
      * 
      */
     public Optional> pool() {
@@ -251,7 +251,7 @@ public Builder fixedIp(String fixedIp) {
         }
 
         /**
-         * @param pool The name of the pool from which the floating IP belongs to.
+         * @param pool The ID of the network from which the floating IP belongs to.
          * 
          * @return builder
          * 
@@ -262,7 +262,7 @@ public Builder pool(@Nullable Output pool) {
         }
 
         /**
-         * @param pool The name of the pool from which the floating IP belongs to.
+         * @param pool The ID of the network from which the floating IP belongs to.
          * 
          * @return builder
          * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetFloatingIpPlainArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetFloatingIpPlainArgs.java
index 7d906db4e..b6d85b30c 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetFloatingIpPlainArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetFloatingIpPlainArgs.java
@@ -61,14 +61,14 @@ public Optional fixedIp() {
     }
 
     /**
-     * The name of the pool from which the floating IP belongs to.
+     * The ID of the network from which the floating IP belongs to.
      * 
      */
     @Import(name="pool")
     private @Nullable String pool;
 
     /**
-     * @return The name of the pool from which the floating IP belongs to.
+     * @return The ID of the network from which the floating IP belongs to.
      * 
      */
     public Optional pool() {
@@ -220,7 +220,7 @@ public Builder fixedIp(@Nullable String fixedIp) {
         }
 
         /**
-         * @param pool The name of the pool from which the floating IP belongs to.
+         * @param pool The ID of the network from which the floating IP belongs to.
          * 
          * @return builder
          * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetSubnetArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetSubnetArgs.java
index 47a66ee6e..a7694a4f1 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetSubnetArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetSubnetArgs.java
@@ -48,25 +48,6 @@ public Optional> description() {
         return Optional.ofNullable(this.description);
     }
 
-    /**
-     * @deprecated
-     * use dhcp_enabled instead
-     * 
-     */
-    @Deprecated /* use dhcp_enabled instead */
-    @Import(name="dhcpDisabled")
-    private @Nullable Output dhcpDisabled;
-
-    /**
-     * @deprecated
-     * use dhcp_enabled instead
-     * 
-     */
-    @Deprecated /* use dhcp_enabled instead */
-    public Optional> dhcpDisabled() {
-        return Optional.ofNullable(this.dhcpDisabled);
-    }
-
     /**
      * If the subnet has DHCP enabled.
      * 
@@ -260,7 +241,6 @@ private GetSubnetArgs() {}
     private GetSubnetArgs(GetSubnetArgs $) {
         this.cidr = $.cidr;
         this.description = $.description;
-        this.dhcpDisabled = $.dhcpDisabled;
         this.dhcpEnabled = $.dhcpEnabled;
         this.gatewayIp = $.gatewayIp;
         this.ipVersion = $.ipVersion;
@@ -335,31 +315,6 @@ public Builder description(String description) {
             return description(Output.of(description));
         }
 
-        /**
-         * @return builder
-         * 
-         * @deprecated
-         * use dhcp_enabled instead
-         * 
-         */
-        @Deprecated /* use dhcp_enabled instead */
-        public Builder dhcpDisabled(@Nullable Output dhcpDisabled) {
-            $.dhcpDisabled = dhcpDisabled;
-            return this;
-        }
-
-        /**
-         * @return builder
-         * 
-         * @deprecated
-         * use dhcp_enabled instead
-         * 
-         */
-        @Deprecated /* use dhcp_enabled instead */
-        public Builder dhcpDisabled(Boolean dhcpDisabled) {
-            return dhcpDisabled(Output.of(dhcpDisabled));
-        }
-
         /**
          * @param dhcpEnabled If the subnet has DHCP enabled.
          * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetSubnetPlainArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetSubnetPlainArgs.java
index 2a9f56b44..bb75ca74d 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetSubnetPlainArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/GetSubnetPlainArgs.java
@@ -47,25 +47,6 @@ public Optional description() {
         return Optional.ofNullable(this.description);
     }
 
-    /**
-     * @deprecated
-     * use dhcp_enabled instead
-     * 
-     */
-    @Deprecated /* use dhcp_enabled instead */
-    @Import(name="dhcpDisabled")
-    private @Nullable Boolean dhcpDisabled;
-
-    /**
-     * @deprecated
-     * use dhcp_enabled instead
-     * 
-     */
-    @Deprecated /* use dhcp_enabled instead */
-    public Optional dhcpDisabled() {
-        return Optional.ofNullable(this.dhcpDisabled);
-    }
-
     /**
      * If the subnet has DHCP enabled.
      * 
@@ -259,7 +240,6 @@ private GetSubnetPlainArgs() {}
     private GetSubnetPlainArgs(GetSubnetPlainArgs $) {
         this.cidr = $.cidr;
         this.description = $.description;
-        this.dhcpDisabled = $.dhcpDisabled;
         this.dhcpEnabled = $.dhcpEnabled;
         this.gatewayIp = $.gatewayIp;
         this.ipVersion = $.ipVersion;
@@ -314,19 +294,6 @@ public Builder description(@Nullable String description) {
             return this;
         }
 
-        /**
-         * @return builder
-         * 
-         * @deprecated
-         * use dhcp_enabled instead
-         * 
-         */
-        @Deprecated /* use dhcp_enabled instead */
-        public Builder dhcpDisabled(@Nullable Boolean dhcpDisabled) {
-            $.dhcpDisabled = dhcpDisabled;
-            return this;
-        }
-
         /**
          * @param dhcpEnabled If the subnet has DHCP enabled.
          * 
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/RouterState.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/RouterState.java
index 19406eccd..5705bc060 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/RouterState.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/RouterState.java
@@ -156,37 +156,6 @@ public Optional>> externalFixedIps() {
         return Optional.ofNullable(this.externalFixedIps);
     }
 
-    /**
-     * The
-     * network UUID of an external gateway for the router. A router with an
-     * external gateway is required if any compute instances or load balancers
-     * will be using floating IPs. Changing this updates the external gateway
-     * of an existing router.
-     * 
-     * @deprecated
-     * use external_network_id instead
-     * 
-     */
-    @Deprecated /* use external_network_id instead */
-    @Import(name="externalGateway")
-    private @Nullable Output externalGateway;
-
-    /**
-     * @return The
-     * network UUID of an external gateway for the router. A router with an
-     * external gateway is required if any compute instances or load balancers
-     * will be using floating IPs. Changing this updates the external gateway
-     * of an existing router.
-     * 
-     * @deprecated
-     * use external_network_id instead
-     * 
-     */
-    @Deprecated /* use external_network_id instead */
-    public Optional> externalGateway() {
-        return Optional.ofNullable(this.externalGateway);
-    }
-
     /**
      * The network UUID of an external gateway
      * for the router. A router with an external gateway is required if any
@@ -343,7 +312,6 @@ private RouterState(RouterState $) {
         this.distributed = $.distributed;
         this.enableSnat = $.enableSnat;
         this.externalFixedIps = $.externalFixedIps;
-        this.externalGateway = $.externalGateway;
         this.externalNetworkId = $.externalNetworkId;
         this.externalSubnetIds = $.externalSubnetIds;
         this.name = $.name;
@@ -586,43 +554,6 @@ public Builder externalFixedIps(RouterExternalFixedIpArgs... externalFixedIps) {
             return externalFixedIps(List.of(externalFixedIps));
         }
 
-        /**
-         * @param externalGateway The
-         * network UUID of an external gateway for the router. A router with an
-         * external gateway is required if any compute instances or load balancers
-         * will be using floating IPs. Changing this updates the external gateway
-         * of an existing router.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * use external_network_id instead
-         * 
-         */
-        @Deprecated /* use external_network_id instead */
-        public Builder externalGateway(@Nullable Output externalGateway) {
-            $.externalGateway = externalGateway;
-            return this;
-        }
-
-        /**
-         * @param externalGateway The
-         * network UUID of an external gateway for the router. A router with an
-         * external gateway is required if any compute instances or load balancers
-         * will be using floating IPs. Changing this updates the external gateway
-         * of an existing router.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * use external_network_id instead
-         * 
-         */
-        @Deprecated /* use external_network_id instead */
-        public Builder externalGateway(String externalGateway) {
-            return externalGateway(Output.of(externalGateway));
-        }
-
         /**
          * @param externalNetworkId The network UUID of an external gateway
          * for the router. A router with an external gateway is required if any
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/SubnetAllocationPoolsCollectionArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/SubnetAllocationPoolsCollectionArgs.java
deleted file mode 100644
index 2fd552b2b..000000000
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/SubnetAllocationPoolsCollectionArgs.java
+++ /dev/null
@@ -1,125 +0,0 @@
-// *** WARNING: this file was generated by pulumi-java-gen. ***
-// *** Do not edit by hand unless you're certain you know what you are doing! ***
-
-package com.pulumi.openstack.networking.inputs;
-
-import com.pulumi.core.Output;
-import com.pulumi.core.annotations.Import;
-import com.pulumi.exceptions.MissingRequiredPropertyException;
-import java.lang.String;
-import java.util.Objects;
-
-
-public final class SubnetAllocationPoolsCollectionArgs extends com.pulumi.resources.ResourceArgs {
-
-    public static final SubnetAllocationPoolsCollectionArgs Empty = new SubnetAllocationPoolsCollectionArgs();
-
-    /**
-     * The ending address.
-     * 
-     */
-    @Import(name="end", required=true)
-    private Output end;
-
-    /**
-     * @return The ending address.
-     * 
-     */
-    public Output end() {
-        return this.end;
-    }
-
-    /**
-     * The starting address.
-     * 
-     */
-    @Import(name="start", required=true)
-    private Output start;
-
-    /**
-     * @return The starting address.
-     * 
-     */
-    public Output start() {
-        return this.start;
-    }
-
-    private SubnetAllocationPoolsCollectionArgs() {}
-
-    private SubnetAllocationPoolsCollectionArgs(SubnetAllocationPoolsCollectionArgs $) {
-        this.end = $.end;
-        this.start = $.start;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-    public static Builder builder(SubnetAllocationPoolsCollectionArgs defaults) {
-        return new Builder(defaults);
-    }
-
-    public static final class Builder {
-        private SubnetAllocationPoolsCollectionArgs $;
-
-        public Builder() {
-            $ = new SubnetAllocationPoolsCollectionArgs();
-        }
-
-        public Builder(SubnetAllocationPoolsCollectionArgs defaults) {
-            $ = new SubnetAllocationPoolsCollectionArgs(Objects.requireNonNull(defaults));
-        }
-
-        /**
-         * @param end The ending address.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder end(Output end) {
-            $.end = end;
-            return this;
-        }
-
-        /**
-         * @param end The ending address.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder end(String end) {
-            return end(Output.of(end));
-        }
-
-        /**
-         * @param start The starting address.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder start(Output start) {
-            $.start = start;
-            return this;
-        }
-
-        /**
-         * @param start The starting address.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder start(String start) {
-            return start(Output.of(start));
-        }
-
-        public SubnetAllocationPoolsCollectionArgs build() {
-            if ($.end == null) {
-                throw new MissingRequiredPropertyException("SubnetAllocationPoolsCollectionArgs", "end");
-            }
-            if ($.start == null) {
-                throw new MissingRequiredPropertyException("SubnetAllocationPoolsCollectionArgs", "start");
-            }
-            return $;
-        }
-    }
-
-}
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/SubnetHostRouteArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/SubnetHostRouteArgs.java
deleted file mode 100644
index fba5961b2..000000000
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/SubnetHostRouteArgs.java
+++ /dev/null
@@ -1,125 +0,0 @@
-// *** WARNING: this file was generated by pulumi-java-gen. ***
-// *** Do not edit by hand unless you're certain you know what you are doing! ***
-
-package com.pulumi.openstack.networking.inputs;
-
-import com.pulumi.core.Output;
-import com.pulumi.core.annotations.Import;
-import com.pulumi.exceptions.MissingRequiredPropertyException;
-import java.lang.String;
-import java.util.Objects;
-
-
-public final class SubnetHostRouteArgs extends com.pulumi.resources.ResourceArgs {
-
-    public static final SubnetHostRouteArgs Empty = new SubnetHostRouteArgs();
-
-    /**
-     * The destination CIDR.
-     * 
-     */
-    @Import(name="destinationCidr", required=true)
-    private Output destinationCidr;
-
-    /**
-     * @return The destination CIDR.
-     * 
-     */
-    public Output destinationCidr() {
-        return this.destinationCidr;
-    }
-
-    /**
-     * The next hop in the route.
-     * 
-     */
-    @Import(name="nextHop", required=true)
-    private Output nextHop;
-
-    /**
-     * @return The next hop in the route.
-     * 
-     */
-    public Output nextHop() {
-        return this.nextHop;
-    }
-
-    private SubnetHostRouteArgs() {}
-
-    private SubnetHostRouteArgs(SubnetHostRouteArgs $) {
-        this.destinationCidr = $.destinationCidr;
-        this.nextHop = $.nextHop;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-    public static Builder builder(SubnetHostRouteArgs defaults) {
-        return new Builder(defaults);
-    }
-
-    public static final class Builder {
-        private SubnetHostRouteArgs $;
-
-        public Builder() {
-            $ = new SubnetHostRouteArgs();
-        }
-
-        public Builder(SubnetHostRouteArgs defaults) {
-            $ = new SubnetHostRouteArgs(Objects.requireNonNull(defaults));
-        }
-
-        /**
-         * @param destinationCidr The destination CIDR.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder destinationCidr(Output destinationCidr) {
-            $.destinationCidr = destinationCidr;
-            return this;
-        }
-
-        /**
-         * @param destinationCidr The destination CIDR.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder destinationCidr(String destinationCidr) {
-            return destinationCidr(Output.of(destinationCidr));
-        }
-
-        /**
-         * @param nextHop The next hop in the route.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder nextHop(Output nextHop) {
-            $.nextHop = nextHop;
-            return this;
-        }
-
-        /**
-         * @param nextHop The next hop in the route.
-         * 
-         * @return builder
-         * 
-         */
-        public Builder nextHop(String nextHop) {
-            return nextHop(Output.of(nextHop));
-        }
-
-        public SubnetHostRouteArgs build() {
-            if ($.destinationCidr == null) {
-                throw new MissingRequiredPropertyException("SubnetHostRouteArgs", "destinationCidr");
-            }
-            if ($.nextHop == null) {
-                throw new MissingRequiredPropertyException("SubnetHostRouteArgs", "nextHop");
-            }
-            return $;
-        }
-    }
-
-}
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/SubnetState.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/SubnetState.java
index 9734c2552..6cef8329b 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/SubnetState.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/inputs/SubnetState.java
@@ -6,8 +6,6 @@
 import com.pulumi.core.Output;
 import com.pulumi.core.annotations.Import;
 import com.pulumi.openstack.networking.inputs.SubnetAllocationPoolArgs;
-import com.pulumi.openstack.networking.inputs.SubnetAllocationPoolsCollectionArgs;
-import com.pulumi.openstack.networking.inputs.SubnetHostRouteArgs;
 import java.lang.Boolean;
 import java.lang.Integer;
 import java.lang.Object;
@@ -65,33 +63,6 @@ public Optional>> allocationPools() {
         return Optional.ofNullable(this.allocationPools);
     }
 
-    /**
-     * A block declaring the start and end range of the IP addresses available for
-     * use with DHCP in this subnet.
-     * The `allocation_pools` block is documented below.
-     * 
-     * @deprecated
-     * use allocation_pool instead
-     * 
-     */
-    @Deprecated /* use allocation_pool instead */
-    @Import(name="allocationPoolsCollection")
-    private @Nullable Output> allocationPoolsCollection;
-
-    /**
-     * @return A block declaring the start and end range of the IP addresses available for
-     * use with DHCP in this subnet.
-     * The `allocation_pools` block is documented below.
-     * 
-     * @deprecated
-     * use allocation_pool instead
-     * 
-     */
-    @Deprecated /* use allocation_pool instead */
-    public Optional>> allocationPoolsCollection() {
-        return Optional.ofNullable(this.allocationPoolsCollection);
-    }
-
     /**
      * CIDR representing IP range for this subnet, based on IP
      * version. You can omit this option if you are creating a subnet from a
@@ -187,37 +158,6 @@ public Optional> gatewayIp() {
         return Optional.ofNullable(this.gatewayIp);
     }
 
-    /**
-     * (**Deprecated** - use `openstack.networking.SubnetRoute`
-     * instead) An array of routes that should be used by devices
-     * with IPs from this subnet (not including local subnet route). The host_route
-     * object structure is documented below. Changing this updates the host routes
-     * for the existing subnet.
-     * 
-     * @deprecated
-     * Use openstack.networking.SubnetRoute instead
-     * 
-     */
-    @Deprecated /* Use openstack.networking.SubnetRoute instead */
-    @Import(name="hostRoutes")
-    private @Nullable Output> hostRoutes;
-
-    /**
-     * @return (**Deprecated** - use `openstack.networking.SubnetRoute`
-     * instead) An array of routes that should be used by devices
-     * with IPs from this subnet (not including local subnet route). The host_route
-     * object structure is documented below. Changing this updates the host routes
-     * for the existing subnet.
-     * 
-     * @deprecated
-     * Use openstack.networking.SubnetRoute instead
-     * 
-     */
-    @Deprecated /* Use openstack.networking.SubnetRoute instead */
-    public Optional>> hostRoutes() {
-        return Optional.ofNullable(this.hostRoutes);
-    }
-
     /**
      * IP version, either 4 (default) or 6. Changing this creates a
      * new subnet.
@@ -446,13 +386,11 @@ private SubnetState() {}
     private SubnetState(SubnetState $) {
         this.allTags = $.allTags;
         this.allocationPools = $.allocationPools;
-        this.allocationPoolsCollection = $.allocationPoolsCollection;
         this.cidr = $.cidr;
         this.description = $.description;
         this.dnsNameservers = $.dnsNameservers;
         this.enableDhcp = $.enableDhcp;
         this.gatewayIp = $.gatewayIp;
-        this.hostRoutes = $.hostRoutes;
         this.ipVersion = $.ipVersion;
         this.ipv6AddressMode = $.ipv6AddressMode;
         this.ipv6RaMode = $.ipv6RaMode;
@@ -566,55 +504,6 @@ public Builder allocationPools(SubnetAllocationPoolArgs... allocationPools) {
             return allocationPools(List.of(allocationPools));
         }
 
-        /**
-         * @param allocationPoolsCollection A block declaring the start and end range of the IP addresses available for
-         * use with DHCP in this subnet.
-         * The `allocation_pools` block is documented below.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * use allocation_pool instead
-         * 
-         */
-        @Deprecated /* use allocation_pool instead */
-        public Builder allocationPoolsCollection(@Nullable Output> allocationPoolsCollection) {
-            $.allocationPoolsCollection = allocationPoolsCollection;
-            return this;
-        }
-
-        /**
-         * @param allocationPoolsCollection A block declaring the start and end range of the IP addresses available for
-         * use with DHCP in this subnet.
-         * The `allocation_pools` block is documented below.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * use allocation_pool instead
-         * 
-         */
-        @Deprecated /* use allocation_pool instead */
-        public Builder allocationPoolsCollection(List allocationPoolsCollection) {
-            return allocationPoolsCollection(Output.of(allocationPoolsCollection));
-        }
-
-        /**
-         * @param allocationPoolsCollection A block declaring the start and end range of the IP addresses available for
-         * use with DHCP in this subnet.
-         * The `allocation_pools` block is documented below.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * use allocation_pool instead
-         * 
-         */
-        @Deprecated /* use allocation_pool instead */
-        public Builder allocationPoolsCollection(SubnetAllocationPoolsCollectionArgs... allocationPoolsCollection) {
-            return allocationPoolsCollection(List.of(allocationPoolsCollection));
-        }
-
         /**
          * @param cidr CIDR representing IP range for this subnet, based on IP
          * version. You can omit this option if you are creating a subnet from a
@@ -752,61 +641,6 @@ public Builder gatewayIp(String gatewayIp) {
             return gatewayIp(Output.of(gatewayIp));
         }
 
-        /**
-         * @param hostRoutes (**Deprecated** - use `openstack.networking.SubnetRoute`
-         * instead) An array of routes that should be used by devices
-         * with IPs from this subnet (not including local subnet route). The host_route
-         * object structure is documented below. Changing this updates the host routes
-         * for the existing subnet.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.networking.SubnetRoute instead
-         * 
-         */
-        @Deprecated /* Use openstack.networking.SubnetRoute instead */
-        public Builder hostRoutes(@Nullable Output> hostRoutes) {
-            $.hostRoutes = hostRoutes;
-            return this;
-        }
-
-        /**
-         * @param hostRoutes (**Deprecated** - use `openstack.networking.SubnetRoute`
-         * instead) An array of routes that should be used by devices
-         * with IPs from this subnet (not including local subnet route). The host_route
-         * object structure is documented below. Changing this updates the host routes
-         * for the existing subnet.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.networking.SubnetRoute instead
-         * 
-         */
-        @Deprecated /* Use openstack.networking.SubnetRoute instead */
-        public Builder hostRoutes(List hostRoutes) {
-            return hostRoutes(Output.of(hostRoutes));
-        }
-
-        /**
-         * @param hostRoutes (**Deprecated** - use `openstack.networking.SubnetRoute`
-         * instead) An array of routes that should be used by devices
-         * with IPs from this subnet (not including local subnet route). The host_route
-         * object structure is documented below. Changing this updates the host routes
-         * for the existing subnet.
-         * 
-         * @return builder
-         * 
-         * @deprecated
-         * Use openstack.networking.SubnetRoute instead
-         * 
-         */
-        @Deprecated /* Use openstack.networking.SubnetRoute instead */
-        public Builder hostRoutes(SubnetHostRouteArgs... hostRoutes) {
-            return hostRoutes(List.of(hostRoutes));
-        }
-
         /**
          * @param ipVersion IP version, either 4 (default) or 6. Changing this creates a
          * new subnet.
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/outputs/GetSubnetResult.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/outputs/GetSubnetResult.java
index bd9dfcfb4..0bc21e0ef 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/outputs/GetSubnetResult.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/networking/outputs/GetSubnetResult.java
@@ -29,13 +29,6 @@ public final class GetSubnetResult {
     private List allocationPools;
     private String cidr;
     private String description;
-    /**
-     * @deprecated
-     * use dhcp_enabled instead
-     * 
-     */
-    @Deprecated /* use dhcp_enabled instead */
-    private @Nullable Boolean dhcpDisabled;
     private @Nullable Boolean dhcpEnabled;
     /**
      * @return DNS Nameservers of the subnet.
@@ -99,15 +92,6 @@ public String cidr() {
     public String description() {
         return this.description;
     }
-    /**
-     * @deprecated
-     * use dhcp_enabled instead
-     * 
-     */
-    @Deprecated /* use dhcp_enabled instead */
-    public Optional dhcpDisabled() {
-        return Optional.ofNullable(this.dhcpDisabled);
-    }
     public Optional dhcpEnabled() {
         return Optional.ofNullable(this.dhcpEnabled);
     }
@@ -197,7 +181,6 @@ public static final class Builder {
         private List allocationPools;
         private String cidr;
         private String description;
-        private @Nullable Boolean dhcpDisabled;
         private @Nullable Boolean dhcpEnabled;
         private List dnsNameservers;
         private Boolean enableDhcp;
@@ -222,7 +205,6 @@ public Builder(GetSubnetResult defaults) {
     	      this.allocationPools = defaults.allocationPools;
     	      this.cidr = defaults.cidr;
     	      this.description = defaults.description;
-    	      this.dhcpDisabled = defaults.dhcpDisabled;
     	      this.dhcpEnabled = defaults.dhcpEnabled;
     	      this.dnsNameservers = defaults.dnsNameservers;
     	      this.enableDhcp = defaults.enableDhcp;
@@ -281,12 +263,6 @@ public Builder description(String description) {
             return this;
         }
         @CustomType.Setter
-        public Builder dhcpDisabled(@Nullable Boolean dhcpDisabled) {
-
-            this.dhcpDisabled = dhcpDisabled;
-            return this;
-        }
-        @CustomType.Setter
         public Builder dhcpEnabled(@Nullable Boolean dhcpEnabled) {
 
             this.dhcpEnabled = dhcpEnabled;
@@ -436,7 +412,6 @@ public GetSubnetResult build() {
             _resultValue.allocationPools = allocationPools;
             _resultValue.cidr = cidr;
             _resultValue.description = description;
-            _resultValue.dhcpDisabled = dhcpDisabled;
             _resultValue.dhcpEnabled = dhcpEnabled;
             _resultValue.dnsNameservers = dnsNameservers;
             _resultValue.enableDhcp = enableDhcp;
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/outputs/SubnetAllocationPoolsCollection.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/outputs/SubnetAllocationPoolsCollection.java
deleted file mode 100644
index 1e4f43750..000000000
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/outputs/SubnetAllocationPoolsCollection.java
+++ /dev/null
@@ -1,81 +0,0 @@
-// *** WARNING: this file was generated by pulumi-java-gen. ***
-// *** Do not edit by hand unless you're certain you know what you are doing! ***
-
-package com.pulumi.openstack.networking.outputs;
-
-import com.pulumi.core.annotations.CustomType;
-import com.pulumi.exceptions.MissingRequiredPropertyException;
-import java.lang.String;
-import java.util.Objects;
-
-@CustomType
-public final class SubnetAllocationPoolsCollection {
-    /**
-     * @return The ending address.
-     * 
-     */
-    private String end;
-    /**
-     * @return The starting address.
-     * 
-     */
-    private String start;
-
-    private SubnetAllocationPoolsCollection() {}
-    /**
-     * @return The ending address.
-     * 
-     */
-    public String end() {
-        return this.end;
-    }
-    /**
-     * @return The starting address.
-     * 
-     */
-    public String start() {
-        return this.start;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static Builder builder(SubnetAllocationPoolsCollection defaults) {
-        return new Builder(defaults);
-    }
-    @CustomType.Builder
-    public static final class Builder {
-        private String end;
-        private String start;
-        public Builder() {}
-        public Builder(SubnetAllocationPoolsCollection defaults) {
-    	      Objects.requireNonNull(defaults);
-    	      this.end = defaults.end;
-    	      this.start = defaults.start;
-        }
-
-        @CustomType.Setter
-        public Builder end(String end) {
-            if (end == null) {
-              throw new MissingRequiredPropertyException("SubnetAllocationPoolsCollection", "end");
-            }
-            this.end = end;
-            return this;
-        }
-        @CustomType.Setter
-        public Builder start(String start) {
-            if (start == null) {
-              throw new MissingRequiredPropertyException("SubnetAllocationPoolsCollection", "start");
-            }
-            this.start = start;
-            return this;
-        }
-        public SubnetAllocationPoolsCollection build() {
-            final var _resultValue = new SubnetAllocationPoolsCollection();
-            _resultValue.end = end;
-            _resultValue.start = start;
-            return _resultValue;
-        }
-    }
-}
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/networking/outputs/SubnetHostRoute.java b/sdk/java/src/main/java/com/pulumi/openstack/networking/outputs/SubnetHostRoute.java
deleted file mode 100644
index 56928a1ae..000000000
--- a/sdk/java/src/main/java/com/pulumi/openstack/networking/outputs/SubnetHostRoute.java
+++ /dev/null
@@ -1,81 +0,0 @@
-// *** WARNING: this file was generated by pulumi-java-gen. ***
-// *** Do not edit by hand unless you're certain you know what you are doing! ***
-
-package com.pulumi.openstack.networking.outputs;
-
-import com.pulumi.core.annotations.CustomType;
-import com.pulumi.exceptions.MissingRequiredPropertyException;
-import java.lang.String;
-import java.util.Objects;
-
-@CustomType
-public final class SubnetHostRoute {
-    /**
-     * @return The destination CIDR.
-     * 
-     */
-    private String destinationCidr;
-    /**
-     * @return The next hop in the route.
-     * 
-     */
-    private String nextHop;
-
-    private SubnetHostRoute() {}
-    /**
-     * @return The destination CIDR.
-     * 
-     */
-    public String destinationCidr() {
-        return this.destinationCidr;
-    }
-    /**
-     * @return The next hop in the route.
-     * 
-     */
-    public String nextHop() {
-        return this.nextHop;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static Builder builder(SubnetHostRoute defaults) {
-        return new Builder(defaults);
-    }
-    @CustomType.Builder
-    public static final class Builder {
-        private String destinationCidr;
-        private String nextHop;
-        public Builder() {}
-        public Builder(SubnetHostRoute defaults) {
-    	      Objects.requireNonNull(defaults);
-    	      this.destinationCidr = defaults.destinationCidr;
-    	      this.nextHop = defaults.nextHop;
-        }
-
-        @CustomType.Setter
-        public Builder destinationCidr(String destinationCidr) {
-            if (destinationCidr == null) {
-              throw new MissingRequiredPropertyException("SubnetHostRoute", "destinationCidr");
-            }
-            this.destinationCidr = destinationCidr;
-            return this;
-        }
-        @CustomType.Setter
-        public Builder nextHop(String nextHop) {
-            if (nextHop == null) {
-              throw new MissingRequiredPropertyException("SubnetHostRoute", "nextHop");
-            }
-            this.nextHop = nextHop;
-            return this;
-        }
-        public SubnetHostRoute build() {
-            final var _resultValue = new SubnetHostRoute();
-            _resultValue.destinationCidr = destinationCidr;
-            _resultValue.nextHop = nextHop;
-            return _resultValue;
-        }
-    }
-}
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/IkePolicy.java b/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/IkePolicy.java
index fae6f212e..464d42773 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/IkePolicy.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/IkePolicy.java
@@ -116,7 +116,7 @@ public Output> encryptionAlgorithm() {
         return Codegen.optional(this.encryptionAlgorithm);
     }
     /**
-     * The IKE mode. A valid value is v1 or v2. Default is v1.
+     * The IKE version. A valid value is v1 or v2. Default is v1.
      * Changing this updates the existing policy.
      * 
      */
@@ -124,7 +124,7 @@ public Output> encryptionAlgorithm() {
     private Output ikeVersion;
 
     /**
-     * @return The IKE mode. A valid value is v1 or v2. Default is v1.
+     * @return The IKE version. A valid value is v1 or v2. Default is v1.
      * Changing this updates the existing policy.
      * 
      */
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/IkePolicyArgs.java b/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/IkePolicyArgs.java
index aee3aa806..f727d55ae 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/IkePolicyArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/IkePolicyArgs.java
@@ -71,7 +71,7 @@ public Optional> encryptionAlgorithm() {
     }
 
     /**
-     * The IKE mode. A valid value is v1 or v2. Default is v1.
+     * The IKE version. A valid value is v1 or v2. Default is v1.
      * Changing this updates the existing policy.
      * 
      */
@@ -79,7 +79,7 @@ public Optional> encryptionAlgorithm() {
     private @Nullable Output ikeVersion;
 
     /**
-     * @return The IKE mode. A valid value is v1 or v2. Default is v1.
+     * @return The IKE version. A valid value is v1 or v2. Default is v1.
      * Changing this updates the existing policy.
      * 
      */
@@ -310,7 +310,7 @@ public Builder encryptionAlgorithm(String encryptionAlgorithm) {
         }
 
         /**
-         * @param ikeVersion The IKE mode. A valid value is v1 or v2. Default is v1.
+         * @param ikeVersion The IKE version. A valid value is v1 or v2. Default is v1.
          * Changing this updates the existing policy.
          * 
          * @return builder
@@ -322,7 +322,7 @@ public Builder ikeVersion(@Nullable Output ikeVersion) {
         }
 
         /**
-         * @param ikeVersion The IKE mode. A valid value is v1 or v2. Default is v1.
+         * @param ikeVersion The IKE version. A valid value is v1 or v2. Default is v1.
          * Changing this updates the existing policy.
          * 
          * @return builder
diff --git a/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/inputs/IkePolicyState.java b/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/inputs/IkePolicyState.java
index 8e1bb3555..fa7c9ad46 100644
--- a/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/inputs/IkePolicyState.java
+++ b/sdk/java/src/main/java/com/pulumi/openstack/vpnaas/inputs/IkePolicyState.java
@@ -71,7 +71,7 @@ public Optional> encryptionAlgorithm() {
     }
 
     /**
-     * The IKE mode. A valid value is v1 or v2. Default is v1.
+     * The IKE version. A valid value is v1 or v2. Default is v1.
      * Changing this updates the existing policy.
      * 
      */
@@ -79,7 +79,7 @@ public Optional> encryptionAlgorithm() {
     private @Nullable Output ikeVersion;
 
     /**
-     * @return The IKE mode. A valid value is v1 or v2. Default is v1.
+     * @return The IKE version. A valid value is v1 or v2. Default is v1.
      * Changing this updates the existing policy.
      * 
      */
@@ -310,7 +310,7 @@ public Builder encryptionAlgorithm(String encryptionAlgorithm) {
         }
 
         /**
-         * @param ikeVersion The IKE mode. A valid value is v1 or v2. Default is v1.
+         * @param ikeVersion The IKE version. A valid value is v1 or v2. Default is v1.
          * Changing this updates the existing policy.
          * 
          * @return builder
@@ -322,7 +322,7 @@ public Builder ikeVersion(@Nullable Output ikeVersion) {
         }
 
         /**
-         * @param ikeVersion The IKE mode. A valid value is v1 or v2. Default is v1.
+         * @param ikeVersion The IKE version. A valid value is v1 or v2. Default is v1.
          * Changing this updates the existing policy.
          * 
          * @return builder
diff --git a/sdk/nodejs/blockstorage/getVolumeV3.ts b/sdk/nodejs/blockstorage/getVolumeV3.ts
index d005702a1..47f8d1c5b 100644
--- a/sdk/nodejs/blockstorage/getVolumeV3.ts
+++ b/sdk/nodejs/blockstorage/getVolumeV3.ts
@@ -96,10 +96,6 @@ export interface GetVolumeV3Result {
      * See Argument Reference above.
      */
     readonly metadata: {[key: string]: any};
-    /**
-     * Indicates if the volume can be attached to more then one server.
-     */
-    readonly multiattach: boolean;
     /**
      * See Argument Reference above.
      */
diff --git a/sdk/nodejs/blockstorage/volume.ts b/sdk/nodejs/blockstorage/volume.ts
index ff6108e0a..06132227b 100644
--- a/sdk/nodejs/blockstorage/volume.ts
+++ b/sdk/nodejs/blockstorage/volume.ts
@@ -103,12 +103,6 @@ export class Volume extends pulumi.CustomResource {
      * Changing this updates the existing volume metadata.
      */
     public readonly metadata!: pulumi.Output<{[key: string]: any}>;
-    /**
-     * (Optional) Allow the volume to be attached to more than one Compute instance.
-     *
-     * @deprecated multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types
-     */
-    public readonly multiattach!: pulumi.Output;
     /**
      * A unique name for the volume. Changing this updates the
      * volume's name.
@@ -172,7 +166,6 @@ export class Volume extends pulumi.CustomResource {
             resourceInputs["enableOnlineResize"] = state ? state.enableOnlineResize : undefined;
             resourceInputs["imageId"] = state ? state.imageId : undefined;
             resourceInputs["metadata"] = state ? state.metadata : undefined;
-            resourceInputs["multiattach"] = state ? state.multiattach : undefined;
             resourceInputs["name"] = state ? state.name : undefined;
             resourceInputs["region"] = state ? state.region : undefined;
             resourceInputs["schedulerHints"] = state ? state.schedulerHints : undefined;
@@ -193,7 +186,6 @@ export class Volume extends pulumi.CustomResource {
             resourceInputs["enableOnlineResize"] = args ? args.enableOnlineResize : undefined;
             resourceInputs["imageId"] = args ? args.imageId : undefined;
             resourceInputs["metadata"] = args ? args.metadata : undefined;
-            resourceInputs["multiattach"] = args ? args.multiattach : undefined;
             resourceInputs["name"] = args ? args.name : undefined;
             resourceInputs["region"] = args ? args.region : undefined;
             resourceInputs["schedulerHints"] = args ? args.schedulerHints : undefined;
@@ -257,12 +249,6 @@ export interface VolumeState {
      * Changing this updates the existing volume metadata.
      */
     metadata?: pulumi.Input<{[key: string]: any}>;
-    /**
-     * (Optional) Allow the volume to be attached to more than one Compute instance.
-     *
-     * @deprecated multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types
-     */
-    multiattach?: pulumi.Input;
     /**
      * A unique name for the volume. Changing this updates the
      * volume's name.
@@ -348,12 +334,6 @@ export interface VolumeArgs {
      * Changing this updates the existing volume metadata.
      */
     metadata?: pulumi.Input<{[key: string]: any}>;
-    /**
-     * (Optional) Allow the volume to be attached to more than one Compute instance.
-     *
-     * @deprecated multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types
-     */
-    multiattach?: pulumi.Input;
     /**
      * A unique name for the volume. Changing this updates the
      * volume's name.
diff --git a/sdk/nodejs/blockstorage/volumeAttachV2.ts b/sdk/nodejs/blockstorage/volumeAttachV2.ts
index 7c43a8e94..fabac0e0b 100644
--- a/sdk/nodejs/blockstorage/volumeAttachV2.ts
+++ b/sdk/nodejs/blockstorage/volumeAttachV2.ts
@@ -122,10 +122,6 @@ export class VolumeAttachV2 extends pulumi.CustomResource {
      * The iSCSI initiator string to make the connection.
      */
     public readonly initiator!: pulumi.Output;
-    /**
-     * @deprecated instance_id is no longer used in this resource
-     */
-    public readonly instanceId!: pulumi.Output;
     /**
      * The IP address of the `hostName` above.
      */
@@ -186,7 +182,6 @@ export class VolumeAttachV2 extends pulumi.CustomResource {
             resourceInputs["driverVolumeType"] = state ? state.driverVolumeType : undefined;
             resourceInputs["hostName"] = state ? state.hostName : undefined;
             resourceInputs["initiator"] = state ? state.initiator : undefined;
-            resourceInputs["instanceId"] = state ? state.instanceId : undefined;
             resourceInputs["ipAddress"] = state ? state.ipAddress : undefined;
             resourceInputs["mountPointBase"] = state ? state.mountPointBase : undefined;
             resourceInputs["multipath"] = state ? state.multipath : undefined;
@@ -208,7 +203,6 @@ export class VolumeAttachV2 extends pulumi.CustomResource {
             resourceInputs["device"] = args ? args.device : undefined;
             resourceInputs["hostName"] = args ? args.hostName : undefined;
             resourceInputs["initiator"] = args ? args.initiator : undefined;
-            resourceInputs["instanceId"] = args ? args.instanceId : undefined;
             resourceInputs["ipAddress"] = args ? args.ipAddress : undefined;
             resourceInputs["multipath"] = args ? args.multipath : undefined;
             resourceInputs["osType"] = args ? args.osType : undefined;
@@ -262,10 +256,6 @@ export interface VolumeAttachV2State {
      * The iSCSI initiator string to make the connection.
      */
     initiator?: pulumi.Input;
-    /**
-     * @deprecated instance_id is no longer used in this resource
-     */
-    instanceId?: pulumi.Input;
     /**
      * The IP address of the `hostName` above.
      */
@@ -332,10 +322,6 @@ export interface VolumeAttachV2Args {
      * The iSCSI initiator string to make the connection.
      */
     initiator?: pulumi.Input;
-    /**
-     * @deprecated instance_id is no longer used in this resource
-     */
-    instanceId?: pulumi.Input;
     /**
      * The IP address of the `hostName` above.
      */
diff --git a/sdk/nodejs/blockstorage/volumeTypeV3.ts b/sdk/nodejs/blockstorage/volumeTypeV3.ts
index 20dc36c12..c22e9deac 100644
--- a/sdk/nodejs/blockstorage/volumeTypeV3.ts
+++ b/sdk/nodejs/blockstorage/volumeTypeV3.ts
@@ -11,6 +11,8 @@ import * as utilities from "../utilities";
  *
  * ## Example Usage
  *
+ * ### Basic Volume Type
+ *
  * ```typescript
  * import * as pulumi from "@pulumi/pulumi";
  * import * as openstack from "@pulumi/openstack";
@@ -25,6 +27,21 @@ import * as utilities from "../utilities";
  * });
  * ```
  *
+ * ### Volume Type with multiattach enabled
+ *
+ * ```typescript
+ * import * as pulumi from "@pulumi/pulumi";
+ * import * as openstack from "@pulumi/openstack";
+ *
+ * const multiattach = new openstack.blockstorage.VolumeTypeV3("multiattach", {
+ *     name: "multiattach",
+ *     description: "Multiattach-enabled volume type",
+ *     extraSpecs: {
+ *         multiattach: " True",
+ *     },
+ * });
+ * ```
+ *
  * ## Import
  *
  * Volume types can be imported using the `volume_type_id`, e.g.
diff --git a/sdk/nodejs/compute/instance.ts b/sdk/nodejs/compute/instance.ts
index df5478aac..376afbc7b 100644
--- a/sdk/nodejs/compute/instance.ts
+++ b/sdk/nodejs/compute/instance.ts
@@ -96,10 +96,6 @@ export class Instance extends pulumi.CustomResource {
      * desired flavor for the server. Changing this resizes the existing server.
      */
     public readonly flavorName!: pulumi.Output;
-    /**
-     * @deprecated Use the openstack.compute.FloatingIpAssociate resource instead
-     */
-    public readonly floatingIp!: pulumi.Output;
     /**
      * Whether to force the OpenStack instance to be
      * forcefully deleted. This is useful for environments that have reclaim / soft
@@ -205,10 +201,6 @@ export class Instance extends pulumi.CustomResource {
      * Supported options are described below.
      */
     public readonly vendorOptions!: pulumi.Output;
-    /**
-     * @deprecated Use blockDevice or openstack.compute.VolumeAttach instead
-     */
-    public readonly volumes!: pulumi.Output;
 
     /**
      * Create a Instance resource with the given unique name, arguments, and options.
@@ -235,7 +227,6 @@ export class Instance extends pulumi.CustomResource {
             resourceInputs["created"] = state ? state.created : undefined;
             resourceInputs["flavorId"] = state ? state.flavorId : undefined;
             resourceInputs["flavorName"] = state ? state.flavorName : undefined;
-            resourceInputs["floatingIp"] = state ? state.floatingIp : undefined;
             resourceInputs["forceDelete"] = state ? state.forceDelete : undefined;
             resourceInputs["imageId"] = state ? state.imageId : undefined;
             resourceInputs["imageName"] = state ? state.imageName : undefined;
@@ -254,7 +245,6 @@ export class Instance extends pulumi.CustomResource {
             resourceInputs["updated"] = state ? state.updated : undefined;
             resourceInputs["userData"] = state ? state.userData : undefined;
             resourceInputs["vendorOptions"] = state ? state.vendorOptions : undefined;
-            resourceInputs["volumes"] = state ? state.volumes : undefined;
         } else {
             const args = argsOrState as InstanceArgs | undefined;
             resourceInputs["accessIpV4"] = args ? args.accessIpV4 : undefined;
@@ -266,7 +256,6 @@ export class Instance extends pulumi.CustomResource {
             resourceInputs["configDrive"] = args ? args.configDrive : undefined;
             resourceInputs["flavorId"] = args ? args.flavorId : undefined;
             resourceInputs["flavorName"] = args ? args.flavorName : undefined;
-            resourceInputs["floatingIp"] = args ? args.floatingIp : undefined;
             resourceInputs["forceDelete"] = args ? args.forceDelete : undefined;
             resourceInputs["imageId"] = args ? args.imageId : undefined;
             resourceInputs["imageName"] = args ? args.imageName : undefined;
@@ -284,7 +273,6 @@ export class Instance extends pulumi.CustomResource {
             resourceInputs["tags"] = args ? args.tags : undefined;
             resourceInputs["userData"] = args ? args.userData : undefined;
             resourceInputs["vendorOptions"] = args ? args.vendorOptions : undefined;
-            resourceInputs["volumes"] = args ? args.volumes : undefined;
             resourceInputs["allMetadata"] = undefined /*out*/;
             resourceInputs["allTags"] = undefined /*out*/;
             resourceInputs["created"] = undefined /*out*/;
@@ -363,10 +351,6 @@ export interface InstanceState {
      * desired flavor for the server. Changing this resizes the existing server.
      */
     flavorName?: pulumi.Input;
-    /**
-     * @deprecated Use the openstack.compute.FloatingIpAssociate resource instead
-     */
-    floatingIp?: pulumi.Input;
     /**
      * Whether to force the OpenStack instance to be
      * forcefully deleted. This is useful for environments that have reclaim / soft
@@ -472,10 +456,6 @@ export interface InstanceState {
      * Supported options are described below.
      */
     vendorOptions?: pulumi.Input;
-    /**
-     * @deprecated Use blockDevice or openstack.compute.VolumeAttach instead
-     */
-    volumes?: pulumi.Input[]>;
 }
 
 /**
@@ -534,10 +514,6 @@ export interface InstanceArgs {
      * desired flavor for the server. Changing this resizes the existing server.
      */
     flavorName?: pulumi.Input;
-    /**
-     * @deprecated Use the openstack.compute.FloatingIpAssociate resource instead
-     */
-    floatingIp?: pulumi.Input;
     /**
      * Whether to force the OpenStack instance to be
      * forcefully deleted. This is useful for environments that have reclaim / soft
@@ -639,8 +615,4 @@ export interface InstanceArgs {
      * Supported options are described below.
      */
     vendorOptions?: pulumi.Input;
-    /**
-     * @deprecated Use blockDevice or openstack.compute.VolumeAttach instead
-     */
-    volumes?: pulumi.Input[]>;
 }
diff --git a/sdk/nodejs/compute/serverGroup.ts b/sdk/nodejs/compute/serverGroup.ts
index c67ddcbf3..e8eaa8ccf 100644
--- a/sdk/nodejs/compute/serverGroup.ts
+++ b/sdk/nodejs/compute/serverGroup.ts
@@ -21,6 +21,17 @@ import * as utilities from "../utilities";
  *     name: "my-sg",
  *     policies: ["anti-affinity"],
  * });
+ * const test_instance = new openstack.compute.Instance("test-instance", {
+ *     name: "my-instance",
+ *     imageId: "ad091b52-742f-469e-8f3c-fd81cadf0743",
+ *     flavorId: "3",
+ *     schedulerHints: [{
+ *         group: test_sg.id,
+ *     }],
+ *     networks: [{
+ *         name: "my_network",
+ *     }],
+ * });
  * ```
  *
  * ### Compute service API version 2.64 or above:
@@ -36,6 +47,17 @@ import * as utilities from "../utilities";
  *         maxServerPerHost: 3,
  *     },
  * });
+ * const test_instance = new openstack.compute.Instance("test-instance", {
+ *     name: "my-instance",
+ *     imageId: "ad091b52-742f-469e-8f3c-fd81cadf0743",
+ *     flavorId: "3",
+ *     schedulerHints: [{
+ *         group: test_sg.id,
+ *     }],
+ *     networks: [{
+ *         name: "my_network",
+ *     }],
+ * });
  * ```
  *
  * ## Policies
diff --git a/sdk/nodejs/compute/volumeAttach.ts b/sdk/nodejs/compute/volumeAttach.ts
index 0238edd7e..a5658efce 100644
--- a/sdk/nodejs/compute/volumeAttach.ts
+++ b/sdk/nodejs/compute/volumeAttach.ts
@@ -35,7 +35,7 @@ import * as utilities from "../utilities";
  * ### Using Multiattach-enabled volumes
  *
  * Multiattach Volumes are dependent upon your OpenStack cloud and not all
- * clouds support multiattach.
+ * clouds support multiattach. Multiattach volumes require a volumeType that has [multiattach enabled](https://docs.openstack.org/cinder/latest/admin/volume-multiattach.html#multiattach-volume-type).
  *
  * ```typescript
  * import * as pulumi from "@pulumi/pulumi";
@@ -44,7 +44,7 @@ import * as utilities from "../utilities";
  * const volume1 = new openstack.blockstorage.Volume("volume_1", {
  *     name: "volume_1",
  *     size: 1,
- *     multiattach: true,
+ *     volumeType: "multiattach",
  * });
  * const instance1 = new openstack.compute.Instance("instance_1", {
  *     name: "instance_1",
@@ -124,6 +124,12 @@ export class VolumeAttach extends pulumi.CustomResource {
      * new volume attachment.
      */
     public readonly region!: pulumi.Output;
+    /**
+     * Add a device role tag that is applied to the volume when
+     * attaching it to the VM. Changing this creates a new volume attachment with
+     * the new tag. Requires microversion >= 2.49.
+     */
+    public readonly tag!: pulumi.Output;
     /**
      * Map of additional vendor-specific options.
      * Supported options are described below.
@@ -151,6 +157,7 @@ export class VolumeAttach extends pulumi.CustomResource {
             resourceInputs["instanceId"] = state ? state.instanceId : undefined;
             resourceInputs["multiattach"] = state ? state.multiattach : undefined;
             resourceInputs["region"] = state ? state.region : undefined;
+            resourceInputs["tag"] = state ? state.tag : undefined;
             resourceInputs["vendorOptions"] = state ? state.vendorOptions : undefined;
             resourceInputs["volumeId"] = state ? state.volumeId : undefined;
         } else {
@@ -165,6 +172,7 @@ export class VolumeAttach extends pulumi.CustomResource {
             resourceInputs["instanceId"] = args ? args.instanceId : undefined;
             resourceInputs["multiattach"] = args ? args.multiattach : undefined;
             resourceInputs["region"] = args ? args.region : undefined;
+            resourceInputs["tag"] = args ? args.tag : undefined;
             resourceInputs["vendorOptions"] = args ? args.vendorOptions : undefined;
             resourceInputs["volumeId"] = args ? args.volumeId : undefined;
         }
@@ -193,6 +201,12 @@ export interface VolumeAttachState {
      * new volume attachment.
      */
     region?: pulumi.Input;
+    /**
+     * Add a device role tag that is applied to the volume when
+     * attaching it to the VM. Changing this creates a new volume attachment with
+     * the new tag. Requires microversion >= 2.49.
+     */
+    tag?: pulumi.Input;
     /**
      * Map of additional vendor-specific options.
      * Supported options are described below.
@@ -224,6 +238,12 @@ export interface VolumeAttachArgs {
      * new volume attachment.
      */
     region?: pulumi.Input;
+    /**
+     * Add a device role tag that is applied to the volume when
+     * attaching it to the VM. Changing this creates a new volume attachment with
+     * the new tag. Requires microversion >= 2.49.
+     */
+    tag?: pulumi.Input;
     /**
      * Map of additional vendor-specific options.
      * Supported options are described below.
diff --git a/sdk/nodejs/config/vars.ts b/sdk/nodejs/config/vars.ts
index 8fc445e0c..4341bbcb5 100644
--- a/sdk/nodejs/config/vars.ts
+++ b/sdk/nodejs/config/vars.ts
@@ -314,17 +314,6 @@ Object.defineProperty(exports, "token", {
     enumerable: true,
 });
 
-/**
- * If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron).
- */
-export declare const useOctavia: boolean | undefined;
-Object.defineProperty(exports, "useOctavia", {
-    get() {
-        return __config.getObject("useOctavia") ?? utilities.getEnvBoolean("OS_USE_OCTAVIA");
-    },
-    enumerable: true,
-});
-
 /**
  * The ID of the domain where the user resides (Identity v3).
  */
diff --git a/sdk/nodejs/images/getImage.ts b/sdk/nodejs/images/getImage.ts
index 806becead..cbcd8a622 100644
--- a/sdk/nodejs/images/getImage.ts
+++ b/sdk/nodejs/images/getImage.ts
@@ -37,8 +37,7 @@ export function getImage(args?: GetImageArgs, opts?: pulumi.InvokeOptions): Prom
         "region": args.region,
         "sizeMax": args.sizeMax,
         "sizeMin": args.sizeMin,
-        "sortDirection": args.sortDirection,
-        "sortKey": args.sortKey,
+        "sort": args.sort,
         "tag": args.tag,
         "tags": args.tags,
         "visibility": args.visibility,
@@ -103,13 +102,13 @@ export interface GetImageArgs {
      */
     sizeMin?: number;
     /**
-     * Order the results in either `asc` or `desc`.
+     * Sorts the response by one or more attribute and sort
+     * direction combinations. You can also set multiple sort keys and directions.
+     * Default direction is `desc`. Use the comma (,) character to separate
+     * multiple values. For example expression `sort = "name:asc,status"`
+     * sorts ascending by name and descending by status.
      */
-    sortDirection?: string;
-    /**
-     * Sort images based on a certain key. Defaults to `name`.
-     */
-    sortKey?: string;
+    sort?: string;
     /**
      * Search for images with a specific tag.
      */
@@ -195,8 +194,7 @@ export interface GetImageResult {
     readonly sizeBytes: number;
     readonly sizeMax?: number;
     readonly sizeMin?: number;
-    readonly sortDirection?: string;
-    readonly sortKey?: string;
+    readonly sort?: string;
     readonly tag?: string;
     /**
      * The tags list of the image.
@@ -288,13 +286,13 @@ export interface GetImageOutputArgs {
      */
     sizeMin?: pulumi.Input;
     /**
-     * Order the results in either `asc` or `desc`.
-     */
-    sortDirection?: pulumi.Input;
-    /**
-     * Sort images based on a certain key. Defaults to `name`.
+     * Sorts the response by one or more attribute and sort
+     * direction combinations. You can also set multiple sort keys and directions.
+     * Default direction is `desc`. Use the comma (,) character to separate
+     * multiple values. For example expression `sort = "name:asc,status"`
+     * sorts ascending by name and descending by status.
      */
-    sortKey?: pulumi.Input;
+    sort?: pulumi.Input;
     /**
      * Search for images with a specific tag.
      */
diff --git a/sdk/nodejs/images/getImageIds.ts b/sdk/nodejs/images/getImageIds.ts
index 38d4c78c3..7e7d4caa8 100644
--- a/sdk/nodejs/images/getImageIds.ts
+++ b/sdk/nodejs/images/getImageIds.ts
@@ -37,8 +37,6 @@ export function getImageIds(args?: GetImageIdsArgs, opts?: pulumi.InvokeOptions)
         "sizeMax": args.sizeMax,
         "sizeMin": args.sizeMin,
         "sort": args.sort,
-        "sortDirection": args.sortDirection,
-        "sortKey": args.sortKey,
         "tag": args.tag,
         "tags": args.tags,
         "visibility": args.visibility,
@@ -96,26 +94,9 @@ export interface GetImageIdsArgs {
      * direction combinations. You can also set multiple sort keys and directions.
      * Default direction is `desc`. Use the comma (,) character to separate
      * multiple values. For example expression `sort = "name:asc,status"`
-     * sorts ascending by name and descending by status. `sort` cannot be used
-     * simultaneously with `sortKey`. If both are present in a configuration
-     * then only `sort` will be used.
+     * sorts ascending by name and descending by status.
      */
     sort?: string;
-    /**
-     * Order the results in either `asc` or `desc`.
-     * Can be applied only with `sortKey`. Defaults to `asc`
-     *
-     * @deprecated Use option 'sort' instead.
-     */
-    sortDirection?: string;
-    /**
-     * Sort images based on a certain key. Defaults to
-     * `name`. `sortKey` cannot be used simultaneously with `sort`. If both
-     * are present in a configuration then only `sort` will be used.
-     *
-     * @deprecated Use option 'sort' instead.
-     */
-    sortKey?: string;
     /**
      * Search for images with a specific tag.
      */
@@ -150,14 +131,6 @@ export interface GetImageIdsResult {
     readonly sizeMax?: number;
     readonly sizeMin?: number;
     readonly sort?: string;
-    /**
-     * @deprecated Use option 'sort' instead.
-     */
-    readonly sortDirection?: string;
-    /**
-     * @deprecated Use option 'sort' instead.
-     */
-    readonly sortKey?: string;
     readonly tag?: string;
     readonly tags?: string[];
     readonly visibility?: string;
@@ -236,26 +209,9 @@ export interface GetImageIdsOutputArgs {
      * direction combinations. You can also set multiple sort keys and directions.
      * Default direction is `desc`. Use the comma (,) character to separate
      * multiple values. For example expression `sort = "name:asc,status"`
-     * sorts ascending by name and descending by status. `sort` cannot be used
-     * simultaneously with `sortKey`. If both are present in a configuration
-     * then only `sort` will be used.
+     * sorts ascending by name and descending by status.
      */
     sort?: pulumi.Input;
-    /**
-     * Order the results in either `asc` or `desc`.
-     * Can be applied only with `sortKey`. Defaults to `asc`
-     *
-     * @deprecated Use option 'sort' instead.
-     */
-    sortDirection?: pulumi.Input;
-    /**
-     * Sort images based on a certain key. Defaults to
-     * `name`. `sortKey` cannot be used simultaneously with `sort`. If both
-     * are present in a configuration then only `sort` will be used.
-     *
-     * @deprecated Use option 'sort' instead.
-     */
-    sortKey?: pulumi.Input;
     /**
      * Search for images with a specific tag.
      */
diff --git a/sdk/nodejs/images/image.ts b/sdk/nodejs/images/image.ts
index dc1db9410..4bd074364 100644
--- a/sdk/nodejs/images/image.ts
+++ b/sdk/nodejs/images/image.ts
@@ -204,12 +204,6 @@ export class Image extends pulumi.CustomResource {
      * At this time, it is not possible to delete all tags of an image.
      */
     public readonly tags!: pulumi.Output;
-    /**
-     * (**Deprecated** - use `updatedAt` instead)
-     *
-     * @deprecated Use updatedAt instead
-     */
-    public /*out*/ readonly updateAt!: pulumi.Output;
     /**
      * The date the image was last updated.
      */
@@ -271,7 +265,6 @@ export class Image extends pulumi.CustomResource {
             resourceInputs["sizeBytes"] = state ? state.sizeBytes : undefined;
             resourceInputs["status"] = state ? state.status : undefined;
             resourceInputs["tags"] = state ? state.tags : undefined;
-            resourceInputs["updateAt"] = state ? state.updateAt : undefined;
             resourceInputs["updatedAt"] = state ? state.updatedAt : undefined;
             resourceInputs["verifyChecksum"] = state ? state.verifyChecksum : undefined;
             resourceInputs["visibility"] = state ? state.visibility : undefined;
@@ -312,7 +305,6 @@ export class Image extends pulumi.CustomResource {
             resourceInputs["schema"] = undefined /*out*/;
             resourceInputs["sizeBytes"] = undefined /*out*/;
             resourceInputs["status"] = undefined /*out*/;
-            resourceInputs["updateAt"] = undefined /*out*/;
             resourceInputs["updatedAt"] = undefined /*out*/;
         }
         opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
@@ -450,12 +442,6 @@ export interface ImageState {
      * At this time, it is not possible to delete all tags of an image.
      */
     tags?: pulumi.Input[]>;
-    /**
-     * (**Deprecated** - use `updatedAt` instead)
-     *
-     * @deprecated Use updatedAt instead
-     */
-    updateAt?: pulumi.Input;
     /**
      * The date the image was last updated.
      */
diff --git a/sdk/nodejs/loadbalancer/getFlavorV2.ts b/sdk/nodejs/loadbalancer/getFlavorV2.ts
new file mode 100644
index 000000000..5919e5770
--- /dev/null
+++ b/sdk/nodejs/loadbalancer/getFlavorV2.ts
@@ -0,0 +1,53 @@
+// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+import * as pulumi from "@pulumi/pulumi";
+import * as utilities from "../utilities";
+
+export function getFlavorV2(args?: GetFlavorV2Args, opts?: pulumi.InvokeOptions): Promise {
+    args = args || {};
+
+    opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts || {});
+    return pulumi.runtime.invoke("openstack:loadbalancer/getFlavorV2:getFlavorV2", {
+        "flavorId": args.flavorId,
+        "name": args.name,
+        "region": args.region,
+    }, opts);
+}
+
+/**
+ * A collection of arguments for invoking getFlavorV2.
+ */
+export interface GetFlavorV2Args {
+    flavorId?: string;
+    name?: string;
+    region?: string;
+}
+
+/**
+ * A collection of values returned by getFlavorV2.
+ */
+export interface GetFlavorV2Result {
+    readonly description: string;
+    readonly enabled: boolean;
+    readonly flavorId: string;
+    readonly flavorProfileId: string;
+    /**
+     * The provider-assigned unique ID for this managed resource.
+     */
+    readonly id: string;
+    readonly name: string;
+    readonly region?: string;
+}
+export function getFlavorV2Output(args?: GetFlavorV2OutputArgs, opts?: pulumi.InvokeOptions): pulumi.Output {
+    return pulumi.output(args).apply((a: any) => getFlavorV2(a, opts))
+}
+
+/**
+ * A collection of arguments for invoking getFlavorV2.
+ */
+export interface GetFlavorV2OutputArgs {
+    flavorId?: pulumi.Input;
+    name?: pulumi.Input;
+    region?: pulumi.Input;
+}
diff --git a/sdk/nodejs/loadbalancer/index.ts b/sdk/nodejs/loadbalancer/index.ts
index 934b66789..419cf4612 100644
--- a/sdk/nodejs/loadbalancer/index.ts
+++ b/sdk/nodejs/loadbalancer/index.ts
@@ -5,6 +5,11 @@ import * as pulumi from "@pulumi/pulumi";
 import * as utilities from "../utilities";
 
 // Export members:
+export { GetFlavorV2Args, GetFlavorV2Result, GetFlavorV2OutputArgs } from "./getFlavorV2";
+export const getFlavorV2: typeof import("./getFlavorV2").getFlavorV2 = null as any;
+export const getFlavorV2Output: typeof import("./getFlavorV2").getFlavorV2Output = null as any;
+utilities.lazyLoad(exports, ["getFlavorV2","getFlavorV2Output"], () => require("./getFlavorV2"));
+
 export { L7PolicyV2Args, L7PolicyV2State } from "./l7policyV2";
 export type L7PolicyV2 = import("./l7policyV2").L7PolicyV2;
 export const L7PolicyV2: typeof import("./l7policyV2").L7PolicyV2 = null as any;
diff --git a/sdk/nodejs/loadbalancer/listener.ts b/sdk/nodejs/loadbalancer/listener.ts
index 9ddf6d81e..b174f2acc 100644
--- a/sdk/nodejs/loadbalancer/listener.ts
+++ b/sdk/nodejs/loadbalancer/listener.ts
@@ -112,8 +112,8 @@ export class Listener extends pulumi.CustomResource {
     public readonly name!: pulumi.Output;
     /**
      * The protocol - can either be TCP, HTTP, HTTPS,
-     * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-     * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+     * TERMINATED_HTTPS, UDP, SCTP (supported only in
+     * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
      * **Octavia minor version >=2.25**). Changing this creates a new Listener.
      */
     public readonly protocol!: pulumi.Output;
@@ -283,8 +283,8 @@ export interface ListenerState {
     name?: pulumi.Input;
     /**
      * The protocol - can either be TCP, HTTP, HTTPS,
-     * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-     * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+     * TERMINATED_HTTPS, UDP, SCTP (supported only in
+     * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
      * **Octavia minor version >=2.25**). Changing this creates a new Listener.
      */
     protocol?: pulumi.Input;
@@ -387,8 +387,8 @@ export interface ListenerArgs {
     name?: pulumi.Input;
     /**
      * The protocol - can either be TCP, HTTP, HTTPS,
-     * TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-     * in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+     * TERMINATED_HTTPS, UDP, SCTP (supported only in
+     * **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
      * **Octavia minor version >=2.25**). Changing this creates a new Listener.
      */
     protocol: pulumi.Input;
diff --git a/sdk/nodejs/loadbalancer/members.ts b/sdk/nodejs/loadbalancer/members.ts
index 696aa59aa..b85fdc5e2 100644
--- a/sdk/nodejs/loadbalancer/members.ts
+++ b/sdk/nodejs/loadbalancer/members.ts
@@ -12,10 +12,6 @@ import * as utilities from "../utilities";
  * > **Note:** This resource has attributes that depend on octavia minor versions.
  * Please ensure your Openstack cloud supports the required minor version.
  *
- * > **Note:** This resource works only within Octavia API. For
- * legacy Neutron LBaaS v2 extension please use
- * openstack.loadbalancer.Member resource.
- *
  * ## Example Usage
  *
  * ```typescript
diff --git a/sdk/nodejs/loadbalancer/pool.ts b/sdk/nodejs/loadbalancer/pool.ts
index 084e886c6..873e53ca0 100644
--- a/sdk/nodejs/loadbalancer/pool.ts
+++ b/sdk/nodejs/loadbalancer/pool.ts
@@ -77,8 +77,7 @@ export class Pool extends pulumi.CustomResource {
     /**
      * The load balancing algorithm to
      * distribute traffic to the pool's members. Must be one of
-     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-     * in Octavia).
+     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
      */
     public readonly lbMethod!: pulumi.Output;
     /**
@@ -105,8 +104,8 @@ export class Pool extends pulumi.CustomResource {
     public readonly persistence!: pulumi.Output;
     /**
      * The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-     * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-     * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+     * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+     * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
      */
     public readonly protocol!: pulumi.Output;
     /**
@@ -186,8 +185,7 @@ export interface PoolState {
     /**
      * The load balancing algorithm to
      * distribute traffic to the pool's members. Must be one of
-     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-     * in Octavia).
+     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
      */
     lbMethod?: pulumi.Input;
     /**
@@ -214,8 +212,8 @@ export interface PoolState {
     persistence?: pulumi.Input;
     /**
      * The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-     * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-     * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+     * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+     * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
      */
     protocol?: pulumi.Input;
     /**
@@ -249,8 +247,7 @@ export interface PoolArgs {
     /**
      * The load balancing algorithm to
      * distribute traffic to the pool's members. Must be one of
-     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-     * in Octavia).
+     * ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
      */
     lbMethod: pulumi.Input;
     /**
@@ -277,8 +274,8 @@ export interface PoolArgs {
     persistence?: pulumi.Input;
     /**
      * The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-     * UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-     * or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+     * UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+     * (**Octavia minor version >= 2.23**). Changing this creates a new pool.
      */
     protocol: pulumi.Input;
     /**
diff --git a/sdk/nodejs/loadbalancer/poolV1.ts b/sdk/nodejs/loadbalancer/poolV1.ts
index e2e9b526e..3bc917314 100644
--- a/sdk/nodejs/loadbalancer/poolV1.ts
+++ b/sdk/nodejs/loadbalancer/poolV1.ts
@@ -109,10 +109,6 @@ import * as utilities from "../utilities";
  * });
  * ```
  *
- * ## Notes
- *
- * The `member` block is deprecated in favor of the `openstack.loadbalancer.MemberV1` resource.
- *
  * ## Import
  *
  * Load Balancer Pools can be imported using the `id`, e.g.
@@ -160,15 +156,6 @@ export class PoolV1 extends pulumi.CustomResource {
      * `haproxy`, `F5`, etc.
      */
     public readonly lbProvider!: pulumi.Output;
-    /**
-     * An existing node to add to the pool. Changing this
-     * updates the members of the pool. The member object structure is documented
-     * below. Please note that the `member` block is deprecated in favor of the
-     * `openstack.loadbalancer.MemberV1` resource.
-     *
-     * @deprecated Use openstack.loadbalancer.MemberV1 instead
-     */
-    public readonly members!: pulumi.Output;
     /**
      * A list of IDs of monitors to associate with the
      * pool.
@@ -218,7 +205,6 @@ export class PoolV1 extends pulumi.CustomResource {
             const state = argsOrState as PoolV1State | undefined;
             resourceInputs["lbMethod"] = state ? state.lbMethod : undefined;
             resourceInputs["lbProvider"] = state ? state.lbProvider : undefined;
-            resourceInputs["members"] = state ? state.members : undefined;
             resourceInputs["monitorIds"] = state ? state.monitorIds : undefined;
             resourceInputs["name"] = state ? state.name : undefined;
             resourceInputs["protocol"] = state ? state.protocol : undefined;
@@ -238,7 +224,6 @@ export class PoolV1 extends pulumi.CustomResource {
             }
             resourceInputs["lbMethod"] = args ? args.lbMethod : undefined;
             resourceInputs["lbProvider"] = args ? args.lbProvider : undefined;
-            resourceInputs["members"] = args ? args.members : undefined;
             resourceInputs["monitorIds"] = args ? args.monitorIds : undefined;
             resourceInputs["name"] = args ? args.name : undefined;
             resourceInputs["protocol"] = args ? args.protocol : undefined;
@@ -266,15 +251,6 @@ export interface PoolV1State {
      * `haproxy`, `F5`, etc.
      */
     lbProvider?: pulumi.Input;
-    /**
-     * An existing node to add to the pool. Changing this
-     * updates the members of the pool. The member object structure is documented
-     * below. Please note that the `member` block is deprecated in favor of the
-     * `openstack.loadbalancer.MemberV1` resource.
-     *
-     * @deprecated Use openstack.loadbalancer.MemberV1 instead
-     */
-    members?: pulumi.Input[]>;
     /**
      * A list of IDs of monitors to associate with the
      * pool.
@@ -325,15 +301,6 @@ export interface PoolV1Args {
      * `haproxy`, `F5`, etc.
      */
     lbProvider?: pulumi.Input;
-    /**
-     * An existing node to add to the pool. Changing this
-     * updates the members of the pool. The member object structure is documented
-     * below. Please note that the `member` block is deprecated in favor of the
-     * `openstack.loadbalancer.MemberV1` resource.
-     *
-     * @deprecated Use openstack.loadbalancer.MemberV1 instead
-     */
-    members?: pulumi.Input[]>;
     /**
      * A list of IDs of monitors to associate with the
      * pool.
diff --git a/sdk/nodejs/loadbalancer/quota.ts b/sdk/nodejs/loadbalancer/quota.ts
index c6df70db9..d3b3a74e5 100644
--- a/sdk/nodejs/loadbalancer/quota.ts
+++ b/sdk/nodejs/loadbalancer/quota.ts
@@ -9,8 +9,6 @@ import * as utilities from "../utilities";
  *
  * > **Note:** This usually requires admin privileges.
  *
- * > **Note:** This resource is only available for Octavia.
- *
  * > **Note:** This resource has a no-op deletion so no actual actions will be done against the OpenStack
  *    API in case of delete call.
  *
diff --git a/sdk/nodejs/networking/getFloatingIp.ts b/sdk/nodejs/networking/getFloatingIp.ts
index 67ff08ddf..d81261d9a 100644
--- a/sdk/nodejs/networking/getFloatingIp.ts
+++ b/sdk/nodejs/networking/getFloatingIp.ts
@@ -52,7 +52,7 @@ export interface GetFloatingIpArgs {
      */
     fixedIp?: string;
     /**
-     * The name of the pool from which the floating IP belongs to.
+     * The ID of the network from which the floating IP belongs to.
      */
     pool?: string;
     /**
@@ -146,7 +146,7 @@ export interface GetFloatingIpOutputArgs {
      */
     fixedIp?: pulumi.Input;
     /**
-     * The name of the pool from which the floating IP belongs to.
+     * The ID of the network from which the floating IP belongs to.
      */
     pool?: pulumi.Input;
     /**
diff --git a/sdk/nodejs/networking/getSubnet.ts b/sdk/nodejs/networking/getSubnet.ts
index 1b53f6b76..a24721300 100644
--- a/sdk/nodejs/networking/getSubnet.ts
+++ b/sdk/nodejs/networking/getSubnet.ts
@@ -27,7 +27,6 @@ export function getSubnet(args?: GetSubnetArgs, opts?: pulumi.InvokeOptions): Pr
     return pulumi.runtime.invoke("openstack:networking/getSubnet:getSubnet", {
         "cidr": args.cidr,
         "description": args.description,
-        "dhcpDisabled": args.dhcpDisabled,
         "dhcpEnabled": args.dhcpEnabled,
         "gatewayIp": args.gatewayIp,
         "ipVersion": args.ipVersion,
@@ -55,10 +54,6 @@ export interface GetSubnetArgs {
      * Human-readable description of the subnet.
      */
     description?: string;
-    /**
-     * @deprecated use dhcpEnabled instead
-     */
-    dhcpDisabled?: boolean;
     /**
      * If the subnet has DHCP enabled.
      */
@@ -127,10 +122,6 @@ export interface GetSubnetResult {
     readonly allocationPools: outputs.networking.GetSubnetAllocationPool[];
     readonly cidr: string;
     readonly description: string;
-    /**
-     * @deprecated use dhcpEnabled instead
-     */
-    readonly dhcpDisabled?: boolean;
     readonly dhcpEnabled?: boolean;
     /**
      * DNS Nameservers of the subnet.
@@ -197,10 +188,6 @@ export interface GetSubnetOutputArgs {
      * Human-readable description of the subnet.
      */
     description?: pulumi.Input;
-    /**
-     * @deprecated use dhcpEnabled instead
-     */
-    dhcpDisabled?: pulumi.Input;
     /**
      * If the subnet has DHCP enabled.
      */
diff --git a/sdk/nodejs/networking/router.ts b/sdk/nodejs/networking/router.ts
index c21557ea5..fa67eba96 100644
--- a/sdk/nodejs/networking/router.ts
+++ b/sdk/nodejs/networking/router.ts
@@ -101,16 +101,6 @@ export class Router extends pulumi.CustomResource {
      * external fixed IPs of the router.
      */
     public readonly externalFixedIps!: pulumi.Output;
-    /**
-     * The
-     * network UUID of an external gateway for the router. A router with an
-     * external gateway is required if any compute instances or load balancers
-     * will be using floating IPs. Changing this updates the external gateway
-     * of an existing router.
-     *
-     * @deprecated use externalNetworkId instead
-     */
-    public readonly externalGateway!: pulumi.Output;
     /**
      * The network UUID of an external gateway
      * for the router. A router with an external gateway is required if any
@@ -177,7 +167,6 @@ export class Router extends pulumi.CustomResource {
             resourceInputs["distributed"] = state ? state.distributed : undefined;
             resourceInputs["enableSnat"] = state ? state.enableSnat : undefined;
             resourceInputs["externalFixedIps"] = state ? state.externalFixedIps : undefined;
-            resourceInputs["externalGateway"] = state ? state.externalGateway : undefined;
             resourceInputs["externalNetworkId"] = state ? state.externalNetworkId : undefined;
             resourceInputs["externalSubnetIds"] = state ? state.externalSubnetIds : undefined;
             resourceInputs["name"] = state ? state.name : undefined;
@@ -194,7 +183,6 @@ export class Router extends pulumi.CustomResource {
             resourceInputs["distributed"] = args ? args.distributed : undefined;
             resourceInputs["enableSnat"] = args ? args.enableSnat : undefined;
             resourceInputs["externalFixedIps"] = args ? args.externalFixedIps : undefined;
-            resourceInputs["externalGateway"] = args ? args.externalGateway : undefined;
             resourceInputs["externalNetworkId"] = args ? args.externalNetworkId : undefined;
             resourceInputs["externalSubnetIds"] = args ? args.externalSubnetIds : undefined;
             resourceInputs["name"] = args ? args.name : undefined;
@@ -257,16 +245,6 @@ export interface RouterState {
      * external fixed IPs of the router.
      */
     externalFixedIps?: pulumi.Input[]>;
-    /**
-     * The
-     * network UUID of an external gateway for the router. A router with an
-     * external gateway is required if any compute instances or load balancers
-     * will be using floating IPs. Changing this updates the external gateway
-     * of an existing router.
-     *
-     * @deprecated use externalNetworkId instead
-     */
-    externalGateway?: pulumi.Input;
     /**
      * The network UUID of an external gateway
      * for the router. A router with an external gateway is required if any
@@ -356,16 +334,6 @@ export interface RouterArgs {
      * external fixed IPs of the router.
      */
     externalFixedIps?: pulumi.Input[]>;
-    /**
-     * The
-     * network UUID of an external gateway for the router. A router with an
-     * external gateway is required if any compute instances or load balancers
-     * will be using floating IPs. Changing this updates the external gateway
-     * of an existing router.
-     *
-     * @deprecated use externalNetworkId instead
-     */
-    externalGateway?: pulumi.Input;
     /**
      * The network UUID of an external gateway
      * for the router. A router with an external gateway is required if any
diff --git a/sdk/nodejs/networking/subnet.ts b/sdk/nodejs/networking/subnet.ts
index c268d30a5..deaa660c7 100644
--- a/sdk/nodejs/networking/subnet.ts
+++ b/sdk/nodejs/networking/subnet.ts
@@ -75,14 +75,6 @@ export class Subnet extends pulumi.CustomResource {
      * The `allocationPool` block is documented below.
      */
     public readonly allocationPools!: pulumi.Output;
-    /**
-     * A block declaring the start and end range of the IP addresses available for
-     * use with DHCP in this subnet.
-     * The `allocationPools` block is documented below.
-     *
-     * @deprecated use allocationPool instead
-     */
-    public readonly allocationPoolsCollection!: pulumi.Output;
     /**
      * CIDR representing IP range for this subnet, based on IP
      * version. You can omit this option if you are creating a subnet from a
@@ -113,16 +105,6 @@ export class Subnet extends pulumi.CustomResource {
      * existing subnet.
      */
     public readonly gatewayIp!: pulumi.Output;
-    /**
-     * (**Deprecated** - use `openstack.networking.SubnetRoute`
-     * instead) An array of routes that should be used by devices
-     * with IPs from this subnet (not including local subnet route). The hostRoute
-     * object structure is documented below. Changing this updates the host routes
-     * for the existing subnet.
-     *
-     * @deprecated Use openstack.networking.SubnetRoute instead
-     */
-    public readonly hostRoutes!: pulumi.Output;
     /**
      * IP version, either 4 (default) or 6. Changing this creates a
      * new subnet.
@@ -205,13 +187,11 @@ export class Subnet extends pulumi.CustomResource {
             const state = argsOrState as SubnetState | undefined;
             resourceInputs["allTags"] = state ? state.allTags : undefined;
             resourceInputs["allocationPools"] = state ? state.allocationPools : undefined;
-            resourceInputs["allocationPoolsCollection"] = state ? state.allocationPoolsCollection : undefined;
             resourceInputs["cidr"] = state ? state.cidr : undefined;
             resourceInputs["description"] = state ? state.description : undefined;
             resourceInputs["dnsNameservers"] = state ? state.dnsNameservers : undefined;
             resourceInputs["enableDhcp"] = state ? state.enableDhcp : undefined;
             resourceInputs["gatewayIp"] = state ? state.gatewayIp : undefined;
-            resourceInputs["hostRoutes"] = state ? state.hostRoutes : undefined;
             resourceInputs["ipVersion"] = state ? state.ipVersion : undefined;
             resourceInputs["ipv6AddressMode"] = state ? state.ipv6AddressMode : undefined;
             resourceInputs["ipv6RaMode"] = state ? state.ipv6RaMode : undefined;
@@ -231,13 +211,11 @@ export class Subnet extends pulumi.CustomResource {
                 throw new Error("Missing required property 'networkId'");
             }
             resourceInputs["allocationPools"] = args ? args.allocationPools : undefined;
-            resourceInputs["allocationPoolsCollection"] = args ? args.allocationPoolsCollection : undefined;
             resourceInputs["cidr"] = args ? args.cidr : undefined;
             resourceInputs["description"] = args ? args.description : undefined;
             resourceInputs["dnsNameservers"] = args ? args.dnsNameservers : undefined;
             resourceInputs["enableDhcp"] = args ? args.enableDhcp : undefined;
             resourceInputs["gatewayIp"] = args ? args.gatewayIp : undefined;
-            resourceInputs["hostRoutes"] = args ? args.hostRoutes : undefined;
             resourceInputs["ipVersion"] = args ? args.ipVersion : undefined;
             resourceInputs["ipv6AddressMode"] = args ? args.ipv6AddressMode : undefined;
             resourceInputs["ipv6RaMode"] = args ? args.ipv6RaMode : undefined;
@@ -276,14 +254,6 @@ export interface SubnetState {
      * The `allocationPool` block is documented below.
      */
     allocationPools?: pulumi.Input[]>;
-    /**
-     * A block declaring the start and end range of the IP addresses available for
-     * use with DHCP in this subnet.
-     * The `allocationPools` block is documented below.
-     *
-     * @deprecated use allocationPool instead
-     */
-    allocationPoolsCollection?: pulumi.Input[]>;
     /**
      * CIDR representing IP range for this subnet, based on IP
      * version. You can omit this option if you are creating a subnet from a
@@ -314,16 +284,6 @@ export interface SubnetState {
      * existing subnet.
      */
     gatewayIp?: pulumi.Input;
-    /**
-     * (**Deprecated** - use `openstack.networking.SubnetRoute`
-     * instead) An array of routes that should be used by devices
-     * with IPs from this subnet (not including local subnet route). The hostRoute
-     * object structure is documented below. Changing this updates the host routes
-     * for the existing subnet.
-     *
-     * @deprecated Use openstack.networking.SubnetRoute instead
-     */
-    hostRoutes?: pulumi.Input[]>;
     /**
      * IP version, either 4 (default) or 6. Changing this creates a
      * new subnet.
@@ -405,14 +365,6 @@ export interface SubnetArgs {
      * The `allocationPool` block is documented below.
      */
     allocationPools?: pulumi.Input[]>;
-    /**
-     * A block declaring the start and end range of the IP addresses available for
-     * use with DHCP in this subnet.
-     * The `allocationPools` block is documented below.
-     *
-     * @deprecated use allocationPool instead
-     */
-    allocationPoolsCollection?: pulumi.Input[]>;
     /**
      * CIDR representing IP range for this subnet, based on IP
      * version. You can omit this option if you are creating a subnet from a
@@ -443,16 +395,6 @@ export interface SubnetArgs {
      * existing subnet.
      */
     gatewayIp?: pulumi.Input;
-    /**
-     * (**Deprecated** - use `openstack.networking.SubnetRoute`
-     * instead) An array of routes that should be used by devices
-     * with IPs from this subnet (not including local subnet route). The hostRoute
-     * object structure is documented below. Changing this updates the host routes
-     * for the existing subnet.
-     *
-     * @deprecated Use openstack.networking.SubnetRoute instead
-     */
-    hostRoutes?: pulumi.Input[]>;
     /**
      * IP version, either 4 (default) or 6. Changing this creates a
      * new subnet.
diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json
index 30db137f1..08834cec7 100644
--- a/sdk/nodejs/package.json
+++ b/sdk/nodejs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@pulumi/openstack",
-    "version": "3.0.0-alpha.0+dev",
+    "version": "4.0.0-alpha.0+dev",
     "description": "A Pulumi package for creating and managing OpenStack cloud resources.",
     "keywords": [
         "pulumi",
@@ -22,6 +22,6 @@
     "pulumi": {
         "resource": true,
         "name": "openstack",
-        "version": "3.0.0-alpha.0+dev"
+        "version": "4.0.0-alpha.0+dev"
     }
 }
diff --git a/sdk/nodejs/provider.ts b/sdk/nodejs/provider.ts
index 46547cd46..06b99263c 100644
--- a/sdk/nodejs/provider.ts
+++ b/sdk/nodejs/provider.ts
@@ -154,7 +154,6 @@ export class Provider extends pulumi.ProviderResource {
             resourceInputs["tenantId"] = args ? args.tenantId : undefined;
             resourceInputs["tenantName"] = args ? args.tenantName : undefined;
             resourceInputs["token"] = args ? args.token : undefined;
-            resourceInputs["useOctavia"] = pulumi.output((args ? args.useOctavia : undefined) ?? utilities.getEnvBoolean("OS_USE_OCTAVIA")).apply(JSON.stringify);
             resourceInputs["userDomainId"] = args ? args.userDomainId : undefined;
             resourceInputs["userDomainName"] = args ? args.userDomainName : undefined;
             resourceInputs["userId"] = args ? args.userId : undefined;
@@ -282,12 +281,6 @@ export interface ProviderArgs {
      * Authentication token to use as an alternative to username/password.
      */
     token?: pulumi.Input;
-    /**
-     * If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron).
-     *
-     * @deprecated Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia.
-     */
-    useOctavia?: pulumi.Input;
     /**
      * The ID of the domain where the user resides (Identity v3).
      */
diff --git a/sdk/nodejs/tsconfig.json b/sdk/nodejs/tsconfig.json
index a866d13a9..4874df91e 100644
--- a/sdk/nodejs/tsconfig.json
+++ b/sdk/nodejs/tsconfig.json
@@ -115,6 +115,7 @@
         "keymanager/index.ts",
         "keymanager/orderV1.ts",
         "keymanager/secretV1.ts",
+        "loadbalancer/getFlavorV2.ts",
         "loadbalancer/index.ts",
         "loadbalancer/l7policyV2.ts",
         "loadbalancer/l7ruleV2.ts",
diff --git a/sdk/nodejs/types/input.ts b/sdk/nodejs/types/input.ts
index 78151c68b..3670ca6d8 100644
--- a/sdk/nodejs/types/input.ts
+++ b/sdk/nodejs/types/input.ts
@@ -232,10 +232,6 @@ export namespace compute {
          */
         fixedIpV4?: pulumi.Input;
         fixedIpV6?: pulumi.Input;
-        /**
-         * @deprecated Use the openstack.compute.FloatingIpAssociate resource instead
-         */
-        floatingIp?: pulumi.Input;
         mac?: pulumi.Input;
         /**
          * The human-readable
@@ -287,7 +283,8 @@ export namespace compute {
         differentHosts?: pulumi.Input[]>;
         /**
          * A UUID of a Server Group. The instance will be placed
-         * into that group.
+         * into that group. See reference
+         * for details on managing servergroup resources
          */
         group?: pulumi.Input;
         /**
@@ -330,12 +327,6 @@ export namespace compute {
         ignoreResizeConfirmation?: pulumi.Input;
     }
 
-    export interface InstanceVolume {
-        device?: pulumi.Input;
-        id?: pulumi.Input;
-        volumeId: pulumi.Input;
-    }
-
     export interface SecGroupRule {
         /**
          * Required if `fromGroupId` or `self` is empty. The IP range
@@ -798,28 +789,6 @@ export namespace networking {
         start: pulumi.Input;
     }
 
-    export interface SubnetAllocationPoolsCollection {
-        /**
-         * The ending address.
-         */
-        end: pulumi.Input;
-        /**
-         * The starting address.
-         */
-        start: pulumi.Input;
-    }
-
-    export interface SubnetHostRoute {
-        /**
-         * The destination CIDR.
-         */
-        destinationCidr: pulumi.Input;
-        /**
-         * The next hop in the route.
-         */
-        nextHop: pulumi.Input;
-    }
-
     export interface TrunkSubPort {
         /**
          * The ID of the port to be made a subport of the trunk.
diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts
index cc00a1d13..10928f9b1 100644
--- a/sdk/nodejs/types/output.ts
+++ b/sdk/nodejs/types/output.ts
@@ -212,10 +212,6 @@ export namespace compute {
          */
         fixedIpV4: string;
         fixedIpV6: string;
-        /**
-         * @deprecated Use the openstack.compute.FloatingIpAssociate resource instead
-         */
-        floatingIp: string;
         mac: string;
         /**
          * The human-readable
@@ -267,7 +263,8 @@ export namespace compute {
         differentHosts?: string[];
         /**
          * A UUID of a Server Group. The instance will be placed
-         * into that group.
+         * into that group. See reference
+         * for details on managing servergroup resources
          */
         group?: string;
         /**
@@ -310,12 +307,6 @@ export namespace compute {
         ignoreResizeConfirmation?: boolean;
     }
 
-    export interface InstanceVolume {
-        device: string;
-        id: string;
-        volumeId: string;
-    }
-
     export interface SecGroupRule {
         /**
          * Required if `fromGroupId` or `self` is empty. The IP range
@@ -1001,28 +992,6 @@ export namespace networking {
         start: string;
     }
 
-    export interface SubnetAllocationPoolsCollection {
-        /**
-         * The ending address.
-         */
-        end: string;
-        /**
-         * The starting address.
-         */
-        start: string;
-    }
-
-    export interface SubnetHostRoute {
-        /**
-         * The destination CIDR.
-         */
-        destinationCidr: string;
-        /**
-         * The next hop in the route.
-         */
-        nextHop: string;
-    }
-
     export interface TrunkSubPort {
         /**
          * The ID of the port to be made a subport of the trunk.
diff --git a/sdk/nodejs/vpnaas/ikePolicy.ts b/sdk/nodejs/vpnaas/ikePolicy.ts
index dd6a25e77..c7cb5d196 100644
--- a/sdk/nodejs/vpnaas/ikePolicy.ts
+++ b/sdk/nodejs/vpnaas/ikePolicy.ts
@@ -70,7 +70,7 @@ export class IkePolicy extends pulumi.CustomResource {
      */
     public readonly encryptionAlgorithm!: pulumi.Output;
     /**
-     * The IKE mode. A valid value is v1 or v2. Default is v1.
+     * The IKE version. A valid value is v1 or v2. Default is v1.
      * Changing this updates the existing policy.
      */
     public readonly ikeVersion!: pulumi.Output;
@@ -173,7 +173,7 @@ export interface IkePolicyState {
      */
     encryptionAlgorithm?: pulumi.Input;
     /**
-     * The IKE mode. A valid value is v1 or v2. Default is v1.
+     * The IKE version. A valid value is v1 or v2. Default is v1.
      * Changing this updates the existing policy.
      */
     ikeVersion?: pulumi.Input;
@@ -234,7 +234,7 @@ export interface IkePolicyArgs {
      */
     encryptionAlgorithm?: pulumi.Input;
     /**
-     * The IKE mode. A valid value is v1 or v2. Default is v1.
+     * The IKE version. A valid value is v1 or v2. Default is v1.
      * Changing this updates the existing policy.
      */
     ikeVersion?: pulumi.Input;
diff --git a/sdk/python/pulumi_openstack/blockstorage/get_volume_v3.py b/sdk/python/pulumi_openstack/blockstorage/get_volume_v3.py
index 85c0a0c3c..5aaa1e74c 100644
--- a/sdk/python/pulumi_openstack/blockstorage/get_volume_v3.py
+++ b/sdk/python/pulumi_openstack/blockstorage/get_volume_v3.py
@@ -22,7 +22,7 @@ class GetVolumeV3Result:
     """
     A collection of values returned by getVolumeV3.
     """
-    def __init__(__self__, attachments=None, bootable=None, host=None, id=None, metadata=None, multiattach=None, name=None, region=None, size=None, source_volume_id=None, status=None, volume_type=None):
+    def __init__(__self__, attachments=None, bootable=None, host=None, id=None, metadata=None, name=None, region=None, size=None, source_volume_id=None, status=None, volume_type=None):
         if attachments and not isinstance(attachments, list):
             raise TypeError("Expected argument 'attachments' to be a list")
         pulumi.set(__self__, "attachments", attachments)
@@ -38,9 +38,6 @@ def __init__(__self__, attachments=None, bootable=None, host=None, id=None, meta
         if metadata and not isinstance(metadata, dict):
             raise TypeError("Expected argument 'metadata' to be a dict")
         pulumi.set(__self__, "metadata", metadata)
-        if multiattach and not isinstance(multiattach, bool):
-            raise TypeError("Expected argument 'multiattach' to be a bool")
-        pulumi.set(__self__, "multiattach", multiattach)
         if name and not isinstance(name, str):
             raise TypeError("Expected argument 'name' to be a str")
         pulumi.set(__self__, "name", name)
@@ -102,14 +99,6 @@ def metadata(self) -> Mapping[str, Any]:
         """
         return pulumi.get(self, "metadata")
 
-    @property
-    @pulumi.getter
-    def multiattach(self) -> bool:
-        """
-        Indicates if the volume can be attached to more then one server.
-        """
-        return pulumi.get(self, "multiattach")
-
     @property
     @pulumi.getter
     def name(self) -> str:
@@ -170,7 +159,6 @@ def __await__(self):
             host=self.host,
             id=self.id,
             metadata=self.metadata,
-            multiattach=self.multiattach,
             name=self.name,
             region=self.region,
             size=self.size,
@@ -226,7 +214,6 @@ def get_volume_v3(bootable: Optional[str] = None,
         host=pulumi.get(__ret__, 'host'),
         id=pulumi.get(__ret__, 'id'),
         metadata=pulumi.get(__ret__, 'metadata'),
-        multiattach=pulumi.get(__ret__, 'multiattach'),
         name=pulumi.get(__ret__, 'name'),
         region=pulumi.get(__ret__, 'region'),
         size=pulumi.get(__ret__, 'size'),
diff --git a/sdk/python/pulumi_openstack/blockstorage/volume.py b/sdk/python/pulumi_openstack/blockstorage/volume.py
index 69f068eab..df1f2182a 100644
--- a/sdk/python/pulumi_openstack/blockstorage/volume.py
+++ b/sdk/python/pulumi_openstack/blockstorage/volume.py
@@ -24,7 +24,6 @@ def __init__(__self__, *,
                  enable_online_resize: Optional[pulumi.Input[bool]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
                  metadata: Optional[pulumi.Input[Mapping[str, Any]]] = None,
-                 multiattach: Optional[pulumi.Input[bool]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  region: Optional[pulumi.Input[str]] = None,
                  scheduler_hints: Optional[pulumi.Input[Sequence[pulumi.Input['VolumeSchedulerHintArgs']]]] = None,
@@ -52,7 +51,6 @@ def __init__(__self__, *,
                creates a new volume.
         :param pulumi.Input[Mapping[str, Any]] metadata: Metadata key/value pairs to associate with the volume.
                Changing this updates the existing volume metadata.
-        :param pulumi.Input[bool] multiattach: (Optional) Allow the volume to be attached to more than one Compute instance.
         :param pulumi.Input[str] name: A unique name for the volume. Changing this updates the
                volume's name.
         :param pulumi.Input[str] region: The region in which to create the volume. If
@@ -85,11 +83,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "image_id", image_id)
         if metadata is not None:
             pulumi.set(__self__, "metadata", metadata)
-        if multiattach is not None:
-            warnings.warn("""multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types""", DeprecationWarning)
-            pulumi.log.warn("""multiattach is deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types""")
-        if multiattach is not None:
-            pulumi.set(__self__, "multiattach", multiattach)
         if name is not None:
             pulumi.set(__self__, "name", name)
         if region is not None:
@@ -211,21 +204,6 @@ def metadata(self) -> Optional[pulumi.Input[Mapping[str, Any]]]:
     def metadata(self, value: Optional[pulumi.Input[Mapping[str, Any]]]):
         pulumi.set(self, "metadata", value)
 
-    @property
-    @pulumi.getter
-    def multiattach(self) -> Optional[pulumi.Input[bool]]:
-        """
-        (Optional) Allow the volume to be attached to more than one Compute instance.
-        """
-        warnings.warn("""multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types""", DeprecationWarning)
-        pulumi.log.warn("""multiattach is deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types""")
-
-        return pulumi.get(self, "multiattach")
-
-    @multiattach.setter
-    def multiattach(self, value: Optional[pulumi.Input[bool]]):
-        pulumi.set(self, "multiattach", value)
-
     @property
     @pulumi.getter
     def name(self) -> Optional[pulumi.Input[str]]:
@@ -331,7 +309,6 @@ def __init__(__self__, *,
                  enable_online_resize: Optional[pulumi.Input[bool]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
                  metadata: Optional[pulumi.Input[Mapping[str, Any]]] = None,
-                 multiattach: Optional[pulumi.Input[bool]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  region: Optional[pulumi.Input[str]] = None,
                  scheduler_hints: Optional[pulumi.Input[Sequence[pulumi.Input['VolumeSchedulerHintArgs']]]] = None,
@@ -362,7 +339,6 @@ def __init__(__self__, *,
                creates a new volume.
         :param pulumi.Input[Mapping[str, Any]] metadata: Metadata key/value pairs to associate with the volume.
                Changing this updates the existing volume metadata.
-        :param pulumi.Input[bool] multiattach: (Optional) Allow the volume to be attached to more than one Compute instance.
         :param pulumi.Input[str] name: A unique name for the volume. Changing this updates the
                volume's name.
         :param pulumi.Input[str] region: The region in which to create the volume. If
@@ -397,11 +373,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "image_id", image_id)
         if metadata is not None:
             pulumi.set(__self__, "metadata", metadata)
-        if multiattach is not None:
-            warnings.warn("""multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types""", DeprecationWarning)
-            pulumi.log.warn("""multiattach is deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types""")
-        if multiattach is not None:
-            pulumi.set(__self__, "multiattach", multiattach)
         if name is not None:
             pulumi.set(__self__, "name", name)
         if region is not None:
@@ -527,21 +498,6 @@ def metadata(self) -> Optional[pulumi.Input[Mapping[str, Any]]]:
     def metadata(self, value: Optional[pulumi.Input[Mapping[str, Any]]]):
         pulumi.set(self, "metadata", value)
 
-    @property
-    @pulumi.getter
-    def multiattach(self) -> Optional[pulumi.Input[bool]]:
-        """
-        (Optional) Allow the volume to be attached to more than one Compute instance.
-        """
-        warnings.warn("""multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types""", DeprecationWarning)
-        pulumi.log.warn("""multiattach is deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types""")
-
-        return pulumi.get(self, "multiattach")
-
-    @multiattach.setter
-    def multiattach(self, value: Optional[pulumi.Input[bool]]):
-        pulumi.set(self, "multiattach", value)
-
     @property
     @pulumi.getter
     def name(self) -> Optional[pulumi.Input[str]]:
@@ -660,7 +616,6 @@ def __init__(__self__,
                  enable_online_resize: Optional[pulumi.Input[bool]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
                  metadata: Optional[pulumi.Input[Mapping[str, Any]]] = None,
-                 multiattach: Optional[pulumi.Input[bool]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  region: Optional[pulumi.Input[str]] = None,
                  scheduler_hints: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['VolumeSchedulerHintArgs']]]]] = None,
@@ -713,7 +668,6 @@ def __init__(__self__,
                creates a new volume.
         :param pulumi.Input[Mapping[str, Any]] metadata: Metadata key/value pairs to associate with the volume.
                Changing this updates the existing volume metadata.
-        :param pulumi.Input[bool] multiattach: (Optional) Allow the volume to be attached to more than one Compute instance.
         :param pulumi.Input[str] name: A unique name for the volume. Changing this updates the
                volume's name.
         :param pulumi.Input[str] region: The region in which to create the volume. If
@@ -784,7 +738,6 @@ def _internal_init(__self__,
                  enable_online_resize: Optional[pulumi.Input[bool]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
                  metadata: Optional[pulumi.Input[Mapping[str, Any]]] = None,
-                 multiattach: Optional[pulumi.Input[bool]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  region: Optional[pulumi.Input[str]] = None,
                  scheduler_hints: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['VolumeSchedulerHintArgs']]]]] = None,
@@ -809,7 +762,6 @@ def _internal_init(__self__,
             __props__.__dict__["enable_online_resize"] = enable_online_resize
             __props__.__dict__["image_id"] = image_id
             __props__.__dict__["metadata"] = metadata
-            __props__.__dict__["multiattach"] = multiattach
             __props__.__dict__["name"] = name
             __props__.__dict__["region"] = region
             __props__.__dict__["scheduler_hints"] = scheduler_hints
@@ -839,7 +791,6 @@ def get(resource_name: str,
             enable_online_resize: Optional[pulumi.Input[bool]] = None,
             image_id: Optional[pulumi.Input[str]] = None,
             metadata: Optional[pulumi.Input[Mapping[str, Any]]] = None,
-            multiattach: Optional[pulumi.Input[bool]] = None,
             name: Optional[pulumi.Input[str]] = None,
             region: Optional[pulumi.Input[str]] = None,
             scheduler_hints: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['VolumeSchedulerHintArgs']]]]] = None,
@@ -875,7 +826,6 @@ def get(resource_name: str,
                creates a new volume.
         :param pulumi.Input[Mapping[str, Any]] metadata: Metadata key/value pairs to associate with the volume.
                Changing this updates the existing volume metadata.
-        :param pulumi.Input[bool] multiattach: (Optional) Allow the volume to be attached to more than one Compute instance.
         :param pulumi.Input[str] name: A unique name for the volume. Changing this updates the
                volume's name.
         :param pulumi.Input[str] region: The region in which to create the volume. If
@@ -906,7 +856,6 @@ def get(resource_name: str,
         __props__.__dict__["enable_online_resize"] = enable_online_resize
         __props__.__dict__["image_id"] = image_id
         __props__.__dict__["metadata"] = metadata
-        __props__.__dict__["multiattach"] = multiattach
         __props__.__dict__["name"] = name
         __props__.__dict__["region"] = region
         __props__.__dict__["scheduler_hints"] = scheduler_hints
@@ -993,17 +942,6 @@ def metadata(self) -> pulumi.Output[Mapping[str, Any]]:
         """
         return pulumi.get(self, "metadata")
 
-    @property
-    @pulumi.getter
-    def multiattach(self) -> pulumi.Output[Optional[bool]]:
-        """
-        (Optional) Allow the volume to be attached to more than one Compute instance.
-        """
-        warnings.warn("""multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types""", DeprecationWarning)
-        pulumi.log.warn("""multiattach is deprecated: multiattach parameter has been deprecated and removed on Openstack Bobcat. The default behavior is to use multiattach enabled volume types""")
-
-        return pulumi.get(self, "multiattach")
-
     @property
     @pulumi.getter
     def name(self) -> pulumi.Output[str]:
diff --git a/sdk/python/pulumi_openstack/blockstorage/volume_attach_v2.py b/sdk/python/pulumi_openstack/blockstorage/volume_attach_v2.py
index 092a54511..13fda7159 100644
--- a/sdk/python/pulumi_openstack/blockstorage/volume_attach_v2.py
+++ b/sdk/python/pulumi_openstack/blockstorage/volume_attach_v2.py
@@ -19,7 +19,6 @@ def __init__(__self__, *,
                  attach_mode: Optional[pulumi.Input[str]] = None,
                  device: Optional[pulumi.Input[str]] = None,
                  initiator: Optional[pulumi.Input[str]] = None,
-                 instance_id: Optional[pulumi.Input[str]] = None,
                  ip_address: Optional[pulumi.Input[str]] = None,
                  multipath: Optional[pulumi.Input[bool]] = None,
                  os_type: Optional[pulumi.Input[str]] = None,
@@ -58,11 +57,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "device", device)
         if initiator is not None:
             pulumi.set(__self__, "initiator", initiator)
-        if instance_id is not None:
-            warnings.warn("""instance_id is no longer used in this resource""", DeprecationWarning)
-            pulumi.log.warn("""instance_id is deprecated: instance_id is no longer used in this resource""")
-        if instance_id is not None:
-            pulumi.set(__self__, "instance_id", instance_id)
         if ip_address is not None:
             pulumi.set(__self__, "ip_address", ip_address)
         if multipath is not None:
@@ -142,18 +136,6 @@ def initiator(self) -> Optional[pulumi.Input[str]]:
     def initiator(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "initiator", value)
 
-    @property
-    @pulumi.getter(name="instanceId")
-    def instance_id(self) -> Optional[pulumi.Input[str]]:
-        warnings.warn("""instance_id is no longer used in this resource""", DeprecationWarning)
-        pulumi.log.warn("""instance_id is deprecated: instance_id is no longer used in this resource""")
-
-        return pulumi.get(self, "instance_id")
-
-    @instance_id.setter
-    def instance_id(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "instance_id", value)
-
     @property
     @pulumi.getter(name="ipAddress")
     def ip_address(self) -> Optional[pulumi.Input[str]]:
@@ -252,7 +234,6 @@ def __init__(__self__, *,
                  driver_volume_type: Optional[pulumi.Input[str]] = None,
                  host_name: Optional[pulumi.Input[str]] = None,
                  initiator: Optional[pulumi.Input[str]] = None,
-                 instance_id: Optional[pulumi.Input[str]] = None,
                  ip_address: Optional[pulumi.Input[str]] = None,
                  mount_point_base: Optional[pulumi.Input[str]] = None,
                  multipath: Optional[pulumi.Input[bool]] = None,
@@ -302,11 +283,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "host_name", host_name)
         if initiator is not None:
             pulumi.set(__self__, "initiator", initiator)
-        if instance_id is not None:
-            warnings.warn("""instance_id is no longer used in this resource""", DeprecationWarning)
-            pulumi.log.warn("""instance_id is deprecated: instance_id is no longer used in this resource""")
-        if instance_id is not None:
-            pulumi.set(__self__, "instance_id", instance_id)
         if ip_address is not None:
             pulumi.set(__self__, "ip_address", ip_address)
         if mount_point_base is not None:
@@ -404,18 +380,6 @@ def initiator(self) -> Optional[pulumi.Input[str]]:
     def initiator(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "initiator", value)
 
-    @property
-    @pulumi.getter(name="instanceId")
-    def instance_id(self) -> Optional[pulumi.Input[str]]:
-        warnings.warn("""instance_id is no longer used in this resource""", DeprecationWarning)
-        pulumi.log.warn("""instance_id is deprecated: instance_id is no longer used in this resource""")
-
-        return pulumi.get(self, "instance_id")
-
-    @instance_id.setter
-    def instance_id(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "instance_id", value)
-
     @property
     @pulumi.getter(name="ipAddress")
     def ip_address(self) -> Optional[pulumi.Input[str]]:
@@ -538,7 +502,6 @@ def __init__(__self__,
                  device: Optional[pulumi.Input[str]] = None,
                  host_name: Optional[pulumi.Input[str]] = None,
                  initiator: Optional[pulumi.Input[str]] = None,
-                 instance_id: Optional[pulumi.Input[str]] = None,
                  ip_address: Optional[pulumi.Input[str]] = None,
                  multipath: Optional[pulumi.Input[bool]] = None,
                  os_type: Optional[pulumi.Input[str]] = None,
@@ -712,7 +675,6 @@ def _internal_init(__self__,
                  device: Optional[pulumi.Input[str]] = None,
                  host_name: Optional[pulumi.Input[str]] = None,
                  initiator: Optional[pulumi.Input[str]] = None,
-                 instance_id: Optional[pulumi.Input[str]] = None,
                  ip_address: Optional[pulumi.Input[str]] = None,
                  multipath: Optional[pulumi.Input[bool]] = None,
                  os_type: Optional[pulumi.Input[str]] = None,
@@ -736,7 +698,6 @@ def _internal_init(__self__,
                 raise TypeError("Missing required property 'host_name'")
             __props__.__dict__["host_name"] = host_name
             __props__.__dict__["initiator"] = initiator
-            __props__.__dict__["instance_id"] = instance_id
             __props__.__dict__["ip_address"] = ip_address
             __props__.__dict__["multipath"] = multipath
             __props__.__dict__["os_type"] = os_type
@@ -768,7 +729,6 @@ def get(resource_name: str,
             driver_volume_type: Optional[pulumi.Input[str]] = None,
             host_name: Optional[pulumi.Input[str]] = None,
             initiator: Optional[pulumi.Input[str]] = None,
-            instance_id: Optional[pulumi.Input[str]] = None,
             ip_address: Optional[pulumi.Input[str]] = None,
             mount_point_base: Optional[pulumi.Input[str]] = None,
             multipath: Optional[pulumi.Input[bool]] = None,
@@ -821,7 +781,6 @@ def get(resource_name: str,
         __props__.__dict__["driver_volume_type"] = driver_volume_type
         __props__.__dict__["host_name"] = host_name
         __props__.__dict__["initiator"] = initiator
-        __props__.__dict__["instance_id"] = instance_id
         __props__.__dict__["ip_address"] = ip_address
         __props__.__dict__["mount_point_base"] = mount_point_base
         __props__.__dict__["multipath"] = multipath
@@ -887,14 +846,6 @@ def initiator(self) -> pulumi.Output[Optional[str]]:
         """
         return pulumi.get(self, "initiator")
 
-    @property
-    @pulumi.getter(name="instanceId")
-    def instance_id(self) -> pulumi.Output[Optional[str]]:
-        warnings.warn("""instance_id is no longer used in this resource""", DeprecationWarning)
-        pulumi.log.warn("""instance_id is deprecated: instance_id is no longer used in this resource""")
-
-        return pulumi.get(self, "instance_id")
-
     @property
     @pulumi.getter(name="ipAddress")
     def ip_address(self) -> pulumi.Output[Optional[str]]:
diff --git a/sdk/python/pulumi_openstack/blockstorage/volume_type_v3.py b/sdk/python/pulumi_openstack/blockstorage/volume_type_v3.py
index c4a6b73f5..874e99e81 100644
--- a/sdk/python/pulumi_openstack/blockstorage/volume_type_v3.py
+++ b/sdk/python/pulumi_openstack/blockstorage/volume_type_v3.py
@@ -225,6 +225,8 @@ def __init__(__self__,
 
         ## Example Usage
 
+        ### Basic Volume Type
+
         ```python
         import pulumi
         import pulumi_openstack as openstack
@@ -238,6 +240,20 @@ def __init__(__self__,
             })
         ```
 
+        ### Volume Type with multiattach enabled
+
+        ```python
+        import pulumi
+        import pulumi_openstack as openstack
+
+        multiattach = openstack.blockstorage.VolumeTypeV3("multiattach",
+            name="multiattach",
+            description="Multiattach-enabled volume type",
+            extra_specs={
+                "multiattach": " True",
+            })
+        ```
+
         ## Import
 
         Volume types can be imported using the `volume_type_id`, e.g.
@@ -272,6 +288,8 @@ def __init__(__self__,
 
         ## Example Usage
 
+        ### Basic Volume Type
+
         ```python
         import pulumi
         import pulumi_openstack as openstack
@@ -285,6 +303,20 @@ def __init__(__self__,
             })
         ```
 
+        ### Volume Type with multiattach enabled
+
+        ```python
+        import pulumi
+        import pulumi_openstack as openstack
+
+        multiattach = openstack.blockstorage.VolumeTypeV3("multiattach",
+            name="multiattach",
+            description="Multiattach-enabled volume type",
+            extra_specs={
+                "multiattach": " True",
+            })
+        ```
+
         ## Import
 
         Volume types can be imported using the `volume_type_id`, e.g.
diff --git a/sdk/python/pulumi_openstack/compute/_inputs.py b/sdk/python/pulumi_openstack/compute/_inputs.py
index 10eb07aa0..3e4b642a3 100644
--- a/sdk/python/pulumi_openstack/compute/_inputs.py
+++ b/sdk/python/pulumi_openstack/compute/_inputs.py
@@ -15,7 +15,6 @@
     'InstancePersonalityArgs',
     'InstanceSchedulerHintArgs',
     'InstanceVendorOptionsArgs',
-    'InstanceVolumeArgs',
     'SecGroupRuleArgs',
     'ServerGroupRulesArgs',
     'VolumeAttachVendorOptionsArgs',
@@ -252,7 +251,6 @@ def __init__(__self__, *,
                  access_network: Optional[pulumi.Input[bool]] = None,
                  fixed_ip_v4: Optional[pulumi.Input[str]] = None,
                  fixed_ip_v6: Optional[pulumi.Input[str]] = None,
-                 floating_ip: Optional[pulumi.Input[str]] = None,
                  mac: Optional[pulumi.Input[str]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  port: Optional[pulumi.Input[str]] = None,
@@ -275,11 +273,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "fixed_ip_v4", fixed_ip_v4)
         if fixed_ip_v6 is not None:
             pulumi.set(__self__, "fixed_ip_v6", fixed_ip_v6)
-        if floating_ip is not None:
-            warnings.warn("""Use the compute.FloatingIpAssociate resource instead""", DeprecationWarning)
-            pulumi.log.warn("""floating_ip is deprecated: Use the compute.FloatingIpAssociate resource instead""")
-        if floating_ip is not None:
-            pulumi.set(__self__, "floating_ip", floating_ip)
         if mac is not None:
             pulumi.set(__self__, "mac", mac)
         if name is not None:
@@ -324,18 +317,6 @@ def fixed_ip_v6(self) -> Optional[pulumi.Input[str]]:
     def fixed_ip_v6(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "fixed_ip_v6", value)
 
-    @property
-    @pulumi.getter(name="floatingIp")
-    def floating_ip(self) -> Optional[pulumi.Input[str]]:
-        warnings.warn("""Use the compute.FloatingIpAssociate resource instead""", DeprecationWarning)
-        pulumi.log.warn("""floating_ip is deprecated: Use the compute.FloatingIpAssociate resource instead""")
-
-        return pulumi.get(self, "floating_ip")
-
-    @floating_ip.setter
-    def floating_ip(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "floating_ip", value)
-
     @property
     @pulumi.getter
     def mac(self) -> Optional[pulumi.Input[str]]:
@@ -442,7 +423,8 @@ def __init__(__self__, *,
         :param pulumi.Input[Sequence[pulumi.Input[str]]] different_hosts: A list of instance UUIDs. The instance will
                be scheduled on a different host than all other instances.
         :param pulumi.Input[str] group: A UUID of a Server Group. The instance will be placed
-               into that group.
+               into that group. See reference
+               for details on managing servergroup resources
         :param pulumi.Input[Sequence[pulumi.Input[str]]] queries: A conditional query that a compute node must pass in
                order to host an instance. The query must use the `JsonFilter` syntax
                which is described
@@ -530,7 +512,8 @@ def different_hosts(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str
     def group(self) -> Optional[pulumi.Input[str]]:
         """
         A UUID of a Server Group. The instance will be placed
-        into that group.
+        into that group. See reference
+        for details on managing servergroup resources
         """
         return pulumi.get(self, "group")
 
@@ -634,46 +617,6 @@ def ignore_resize_confirmation(self, value: Optional[pulumi.Input[bool]]):
         pulumi.set(self, "ignore_resize_confirmation", value)
 
 
-@pulumi.input_type
-class InstanceVolumeArgs:
-    def __init__(__self__, *,
-                 volume_id: pulumi.Input[str],
-                 device: Optional[pulumi.Input[str]] = None,
-                 id: Optional[pulumi.Input[str]] = None):
-        pulumi.set(__self__, "volume_id", volume_id)
-        if device is not None:
-            pulumi.set(__self__, "device", device)
-        if id is not None:
-            pulumi.set(__self__, "id", id)
-
-    @property
-    @pulumi.getter(name="volumeId")
-    def volume_id(self) -> pulumi.Input[str]:
-        return pulumi.get(self, "volume_id")
-
-    @volume_id.setter
-    def volume_id(self, value: pulumi.Input[str]):
-        pulumi.set(self, "volume_id", value)
-
-    @property
-    @pulumi.getter
-    def device(self) -> Optional[pulumi.Input[str]]:
-        return pulumi.get(self, "device")
-
-    @device.setter
-    def device(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "device", value)
-
-    @property
-    @pulumi.getter
-    def id(self) -> Optional[pulumi.Input[str]]:
-        return pulumi.get(self, "id")
-
-    @id.setter
-    def id(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "id", value)
-
-
 @pulumi.input_type
 class SecGroupRuleArgs:
     def __init__(__self__, *,
diff --git a/sdk/python/pulumi_openstack/compute/instance.py b/sdk/python/pulumi_openstack/compute/instance.py
index f206dd7b0..6d49f3d84 100644
--- a/sdk/python/pulumi_openstack/compute/instance.py
+++ b/sdk/python/pulumi_openstack/compute/instance.py
@@ -25,7 +25,6 @@ def __init__(__self__, *,
                  config_drive: Optional[pulumi.Input[bool]] = None,
                  flavor_id: Optional[pulumi.Input[str]] = None,
                  flavor_name: Optional[pulumi.Input[str]] = None,
-                 floating_ip: Optional[pulumi.Input[str]] = None,
                  force_delete: Optional[pulumi.Input[bool]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
                  image_name: Optional[pulumi.Input[str]] = None,
@@ -42,8 +41,7 @@ def __init__(__self__, *,
                  stop_before_destroy: Optional[pulumi.Input[bool]] = None,
                  tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  user_data: Optional[pulumi.Input[str]] = None,
-                 vendor_options: Optional[pulumi.Input['InstanceVendorOptionsArgs']] = None,
-                 volumes: Optional[pulumi.Input[Sequence[pulumi.Input['InstanceVolumeArgs']]]] = None):
+                 vendor_options: Optional[pulumi.Input['InstanceVendorOptionsArgs']] = None):
         """
         The set of arguments for constructing a Instance resource.
         :param pulumi.Input[str] access_ip_v4: The first detected Fixed IPv4 address.
@@ -140,11 +138,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "flavor_id", flavor_id)
         if flavor_name is not None:
             pulumi.set(__self__, "flavor_name", flavor_name)
-        if floating_ip is not None:
-            warnings.warn("""Use the compute.FloatingIpAssociate resource instead""", DeprecationWarning)
-            pulumi.log.warn("""floating_ip is deprecated: Use the compute.FloatingIpAssociate resource instead""")
-        if floating_ip is not None:
-            pulumi.set(__self__, "floating_ip", floating_ip)
         if force_delete is not None:
             pulumi.set(__self__, "force_delete", force_delete)
         if image_id is not None:
@@ -179,11 +172,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "user_data", user_data)
         if vendor_options is not None:
             pulumi.set(__self__, "vendor_options", vendor_options)
-        if volumes is not None:
-            warnings.warn("""Use block_device or compute.VolumeAttach instead""", DeprecationWarning)
-            pulumi.log.warn("""volumes is deprecated: Use block_device or compute.VolumeAttach instead""")
-        if volumes is not None:
-            pulumi.set(__self__, "volumes", volumes)
 
     @property
     @pulumi.getter(name="accessIpV4")
@@ -309,18 +297,6 @@ def flavor_name(self) -> Optional[pulumi.Input[str]]:
     def flavor_name(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "flavor_name", value)
 
-    @property
-    @pulumi.getter(name="floatingIp")
-    def floating_ip(self) -> Optional[pulumi.Input[str]]:
-        warnings.warn("""Use the compute.FloatingIpAssociate resource instead""", DeprecationWarning)
-        pulumi.log.warn("""floating_ip is deprecated: Use the compute.FloatingIpAssociate resource instead""")
-
-        return pulumi.get(self, "floating_ip")
-
-    @floating_ip.setter
-    def floating_ip(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "floating_ip", value)
-
     @property
     @pulumi.getter(name="forceDelete")
     def force_delete(self) -> Optional[pulumi.Input[bool]]:
@@ -558,18 +534,6 @@ def vendor_options(self) -> Optional[pulumi.Input['InstanceVendorOptionsArgs']]:
     def vendor_options(self, value: Optional[pulumi.Input['InstanceVendorOptionsArgs']]):
         pulumi.set(self, "vendor_options", value)
 
-    @property
-    @pulumi.getter
-    def volumes(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['InstanceVolumeArgs']]]]:
-        warnings.warn("""Use block_device or compute.VolumeAttach instead""", DeprecationWarning)
-        pulumi.log.warn("""volumes is deprecated: Use block_device or compute.VolumeAttach instead""")
-
-        return pulumi.get(self, "volumes")
-
-    @volumes.setter
-    def volumes(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['InstanceVolumeArgs']]]]):
-        pulumi.set(self, "volumes", value)
-
 
 @pulumi.input_type
 class _InstanceState:
@@ -586,7 +550,6 @@ def __init__(__self__, *,
                  created: Optional[pulumi.Input[str]] = None,
                  flavor_id: Optional[pulumi.Input[str]] = None,
                  flavor_name: Optional[pulumi.Input[str]] = None,
-                 floating_ip: Optional[pulumi.Input[str]] = None,
                  force_delete: Optional[pulumi.Input[bool]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
                  image_name: Optional[pulumi.Input[str]] = None,
@@ -604,8 +567,7 @@ def __init__(__self__, *,
                  tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  updated: Optional[pulumi.Input[str]] = None,
                  user_data: Optional[pulumi.Input[str]] = None,
-                 vendor_options: Optional[pulumi.Input['InstanceVendorOptionsArgs']] = None,
-                 volumes: Optional[pulumi.Input[Sequence[pulumi.Input['InstanceVolumeArgs']]]] = None):
+                 vendor_options: Optional[pulumi.Input['InstanceVendorOptionsArgs']] = None):
         """
         Input properties used for looking up and filtering Instance resources.
         :param pulumi.Input[str] access_ip_v4: The first detected Fixed IPv4 address.
@@ -712,11 +674,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "flavor_id", flavor_id)
         if flavor_name is not None:
             pulumi.set(__self__, "flavor_name", flavor_name)
-        if floating_ip is not None:
-            warnings.warn("""Use the compute.FloatingIpAssociate resource instead""", DeprecationWarning)
-            pulumi.log.warn("""floating_ip is deprecated: Use the compute.FloatingIpAssociate resource instead""")
-        if floating_ip is not None:
-            pulumi.set(__self__, "floating_ip", floating_ip)
         if force_delete is not None:
             pulumi.set(__self__, "force_delete", force_delete)
         if image_id is not None:
@@ -753,11 +710,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "user_data", user_data)
         if vendor_options is not None:
             pulumi.set(__self__, "vendor_options", vendor_options)
-        if volumes is not None:
-            warnings.warn("""Use block_device or compute.VolumeAttach instead""", DeprecationWarning)
-            pulumi.log.warn("""volumes is deprecated: Use block_device or compute.VolumeAttach instead""")
-        if volumes is not None:
-            pulumi.set(__self__, "volumes", volumes)
 
     @property
     @pulumi.getter(name="accessIpV4")
@@ -917,18 +869,6 @@ def flavor_name(self) -> Optional[pulumi.Input[str]]:
     def flavor_name(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "flavor_name", value)
 
-    @property
-    @pulumi.getter(name="floatingIp")
-    def floating_ip(self) -> Optional[pulumi.Input[str]]:
-        warnings.warn("""Use the compute.FloatingIpAssociate resource instead""", DeprecationWarning)
-        pulumi.log.warn("""floating_ip is deprecated: Use the compute.FloatingIpAssociate resource instead""")
-
-        return pulumi.get(self, "floating_ip")
-
-    @floating_ip.setter
-    def floating_ip(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "floating_ip", value)
-
     @property
     @pulumi.getter(name="forceDelete")
     def force_delete(self) -> Optional[pulumi.Input[bool]]:
@@ -1178,18 +1118,6 @@ def vendor_options(self) -> Optional[pulumi.Input['InstanceVendorOptionsArgs']]:
     def vendor_options(self, value: Optional[pulumi.Input['InstanceVendorOptionsArgs']]):
         pulumi.set(self, "vendor_options", value)
 
-    @property
-    @pulumi.getter
-    def volumes(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['InstanceVolumeArgs']]]]:
-        warnings.warn("""Use block_device or compute.VolumeAttach instead""", DeprecationWarning)
-        pulumi.log.warn("""volumes is deprecated: Use block_device or compute.VolumeAttach instead""")
-
-        return pulumi.get(self, "volumes")
-
-    @volumes.setter
-    def volumes(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['InstanceVolumeArgs']]]]):
-        pulumi.set(self, "volumes", value)
-
 
 class Instance(pulumi.CustomResource):
     @overload
@@ -1205,7 +1133,6 @@ def __init__(__self__,
                  config_drive: Optional[pulumi.Input[bool]] = None,
                  flavor_id: Optional[pulumi.Input[str]] = None,
                  flavor_name: Optional[pulumi.Input[str]] = None,
-                 floating_ip: Optional[pulumi.Input[str]] = None,
                  force_delete: Optional[pulumi.Input[bool]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
                  image_name: Optional[pulumi.Input[str]] = None,
@@ -1223,7 +1150,6 @@ def __init__(__self__,
                  tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  user_data: Optional[pulumi.Input[str]] = None,
                  vendor_options: Optional[pulumi.Input[pulumi.InputType['InstanceVendorOptionsArgs']]] = None,
-                 volumes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['InstanceVolumeArgs']]]]] = None,
                  __props__=None):
         """
         Create a Instance resource with the given unique name, props, and options.
@@ -1337,7 +1263,6 @@ def _internal_init(__self__,
                  config_drive: Optional[pulumi.Input[bool]] = None,
                  flavor_id: Optional[pulumi.Input[str]] = None,
                  flavor_name: Optional[pulumi.Input[str]] = None,
-                 floating_ip: Optional[pulumi.Input[str]] = None,
                  force_delete: Optional[pulumi.Input[bool]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
                  image_name: Optional[pulumi.Input[str]] = None,
@@ -1355,7 +1280,6 @@ def _internal_init(__self__,
                  tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  user_data: Optional[pulumi.Input[str]] = None,
                  vendor_options: Optional[pulumi.Input[pulumi.InputType['InstanceVendorOptionsArgs']]] = None,
-                 volumes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['InstanceVolumeArgs']]]]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
         if not isinstance(opts, pulumi.ResourceOptions):
@@ -1374,7 +1298,6 @@ def _internal_init(__self__,
             __props__.__dict__["config_drive"] = config_drive
             __props__.__dict__["flavor_id"] = flavor_id
             __props__.__dict__["flavor_name"] = flavor_name
-            __props__.__dict__["floating_ip"] = floating_ip
             __props__.__dict__["force_delete"] = force_delete
             __props__.__dict__["image_id"] = image_id
             __props__.__dict__["image_name"] = image_name
@@ -1392,7 +1315,6 @@ def _internal_init(__self__,
             __props__.__dict__["tags"] = tags
             __props__.__dict__["user_data"] = user_data
             __props__.__dict__["vendor_options"] = vendor_options
-            __props__.__dict__["volumes"] = volumes
             __props__.__dict__["all_metadata"] = None
             __props__.__dict__["all_tags"] = None
             __props__.__dict__["created"] = None
@@ -1421,7 +1343,6 @@ def get(resource_name: str,
             created: Optional[pulumi.Input[str]] = None,
             flavor_id: Optional[pulumi.Input[str]] = None,
             flavor_name: Optional[pulumi.Input[str]] = None,
-            floating_ip: Optional[pulumi.Input[str]] = None,
             force_delete: Optional[pulumi.Input[bool]] = None,
             image_id: Optional[pulumi.Input[str]] = None,
             image_name: Optional[pulumi.Input[str]] = None,
@@ -1439,8 +1360,7 @@ def get(resource_name: str,
             tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             updated: Optional[pulumi.Input[str]] = None,
             user_data: Optional[pulumi.Input[str]] = None,
-            vendor_options: Optional[pulumi.Input[pulumi.InputType['InstanceVendorOptionsArgs']]] = None,
-            volumes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['InstanceVolumeArgs']]]]] = None) -> 'Instance':
+            vendor_options: Optional[pulumi.Input[pulumi.InputType['InstanceVendorOptionsArgs']]] = None) -> 'Instance':
         """
         Get an existing Instance resource's state with the given name, id, and optional extra
         properties used to qualify the lookup.
@@ -1544,7 +1464,6 @@ def get(resource_name: str,
         __props__.__dict__["created"] = created
         __props__.__dict__["flavor_id"] = flavor_id
         __props__.__dict__["flavor_name"] = flavor_name
-        __props__.__dict__["floating_ip"] = floating_ip
         __props__.__dict__["force_delete"] = force_delete
         __props__.__dict__["image_id"] = image_id
         __props__.__dict__["image_name"] = image_name
@@ -1563,7 +1482,6 @@ def get(resource_name: str,
         __props__.__dict__["updated"] = updated
         __props__.__dict__["user_data"] = user_data
         __props__.__dict__["vendor_options"] = vendor_options
-        __props__.__dict__["volumes"] = volumes
         return Instance(resource_name, opts=opts, __props__=__props__)
 
     @property
@@ -1676,14 +1594,6 @@ def flavor_name(self) -> pulumi.Output[str]:
         """
         return pulumi.get(self, "flavor_name")
 
-    @property
-    @pulumi.getter(name="floatingIp")
-    def floating_ip(self) -> pulumi.Output[Optional[str]]:
-        warnings.warn("""Use the compute.FloatingIpAssociate resource instead""", DeprecationWarning)
-        pulumi.log.warn("""floating_ip is deprecated: Use the compute.FloatingIpAssociate resource instead""")
-
-        return pulumi.get(self, "floating_ip")
-
     @property
     @pulumi.getter(name="forceDelete")
     def force_delete(self) -> pulumi.Output[Optional[bool]]:
@@ -1861,11 +1771,3 @@ def vendor_options(self) -> pulumi.Output[Optional['outputs.InstanceVendorOption
         """
         return pulumi.get(self, "vendor_options")
 
-    @property
-    @pulumi.getter
-    def volumes(self) -> pulumi.Output[Optional[Sequence['outputs.InstanceVolume']]]:
-        warnings.warn("""Use block_device or compute.VolumeAttach instead""", DeprecationWarning)
-        pulumi.log.warn("""volumes is deprecated: Use block_device or compute.VolumeAttach instead""")
-
-        return pulumi.get(self, "volumes")
-
diff --git a/sdk/python/pulumi_openstack/compute/outputs.py b/sdk/python/pulumi_openstack/compute/outputs.py
index a8149eb63..4397ab2a5 100644
--- a/sdk/python/pulumi_openstack/compute/outputs.py
+++ b/sdk/python/pulumi_openstack/compute/outputs.py
@@ -15,7 +15,6 @@
     'InstancePersonality',
     'InstanceSchedulerHint',
     'InstanceVendorOptions',
-    'InstanceVolume',
     'SecGroupRule',
     'ServerGroupRules',
     'VolumeAttachVendorOptions',
@@ -246,8 +245,6 @@ def __key_warning(key: str):
             suggest = "fixed_ip_v4"
         elif key == "fixedIpV6":
             suggest = "fixed_ip_v6"
-        elif key == "floatingIp":
-            suggest = "floating_ip"
 
         if suggest:
             pulumi.log.warn(f"Key '{key}' not found in InstanceNetwork. Access the value via the '{suggest}' property getter instead.")
@@ -264,7 +261,6 @@ def __init__(__self__, *,
                  access_network: Optional[bool] = None,
                  fixed_ip_v4: Optional[str] = None,
                  fixed_ip_v6: Optional[str] = None,
-                 floating_ip: Optional[str] = None,
                  mac: Optional[str] = None,
                  name: Optional[str] = None,
                  port: Optional[str] = None,
@@ -287,8 +283,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "fixed_ip_v4", fixed_ip_v4)
         if fixed_ip_v6 is not None:
             pulumi.set(__self__, "fixed_ip_v6", fixed_ip_v6)
-        if floating_ip is not None:
-            pulumi.set(__self__, "floating_ip", floating_ip)
         if mac is not None:
             pulumi.set(__self__, "mac", mac)
         if name is not None:
@@ -321,14 +315,6 @@ def fixed_ip_v4(self) -> Optional[str]:
     def fixed_ip_v6(self) -> Optional[str]:
         return pulumi.get(self, "fixed_ip_v6")
 
-    @property
-    @pulumi.getter(name="floatingIp")
-    def floating_ip(self) -> Optional[str]:
-        warnings.warn("""Use the compute.FloatingIpAssociate resource instead""", DeprecationWarning)
-        pulumi.log.warn("""floating_ip is deprecated: Use the compute.FloatingIpAssociate resource instead""")
-
-        return pulumi.get(self, "floating_ip")
-
     @property
     @pulumi.getter
     def mac(self) -> Optional[str]:
@@ -438,7 +424,8 @@ def __init__(__self__, *,
         :param Sequence[str] different_hosts: A list of instance UUIDs. The instance will
                be scheduled on a different host than all other instances.
         :param str group: A UUID of a Server Group. The instance will be placed
-               into that group.
+               into that group. See reference
+               for details on managing servergroup resources
         :param Sequence[str] queries: A conditional query that a compute node must pass in
                order to host an instance. The query must use the `JsonFilter` syntax
                which is described
@@ -510,7 +497,8 @@ def different_hosts(self) -> Optional[Sequence[str]]:
     def group(self) -> Optional[str]:
         """
         A UUID of a Server Group. The instance will be placed
-        into that group.
+        into that group. See reference
+        for details on managing servergroup resources
         """
         return pulumi.get(self, "group")
 
@@ -609,51 +597,6 @@ def ignore_resize_confirmation(self) -> Optional[bool]:
         return pulumi.get(self, "ignore_resize_confirmation")
 
 
-@pulumi.output_type
-class InstanceVolume(dict):
-    @staticmethod
-    def __key_warning(key: str):
-        suggest = None
-        if key == "volumeId":
-            suggest = "volume_id"
-
-        if suggest:
-            pulumi.log.warn(f"Key '{key}' not found in InstanceVolume. Access the value via the '{suggest}' property getter instead.")
-
-    def __getitem__(self, key: str) -> Any:
-        InstanceVolume.__key_warning(key)
-        return super().__getitem__(key)
-
-    def get(self, key: str, default = None) -> Any:
-        InstanceVolume.__key_warning(key)
-        return super().get(key, default)
-
-    def __init__(__self__, *,
-                 volume_id: str,
-                 device: Optional[str] = None,
-                 id: Optional[str] = None):
-        pulumi.set(__self__, "volume_id", volume_id)
-        if device is not None:
-            pulumi.set(__self__, "device", device)
-        if id is not None:
-            pulumi.set(__self__, "id", id)
-
-    @property
-    @pulumi.getter(name="volumeId")
-    def volume_id(self) -> str:
-        return pulumi.get(self, "volume_id")
-
-    @property
-    @pulumi.getter
-    def device(self) -> Optional[str]:
-        return pulumi.get(self, "device")
-
-    @property
-    @pulumi.getter
-    def id(self) -> Optional[str]:
-        return pulumi.get(self, "id")
-
-
 @pulumi.output_type
 class SecGroupRule(dict):
     @staticmethod
diff --git a/sdk/python/pulumi_openstack/compute/server_group.py b/sdk/python/pulumi_openstack/compute/server_group.py
index 0c74a39e5..02991989d 100644
--- a/sdk/python/pulumi_openstack/compute/server_group.py
+++ b/sdk/python/pulumi_openstack/compute/server_group.py
@@ -254,6 +254,16 @@ def __init__(__self__,
         test_sg = openstack.compute.ServerGroup("test-sg",
             name="my-sg",
             policies=["anti-affinity"])
+        test_instance = openstack.compute.Instance("test-instance",
+            name="my-instance",
+            image_id="ad091b52-742f-469e-8f3c-fd81cadf0743",
+            flavor_id="3",
+            scheduler_hints=[openstack.compute.InstanceSchedulerHintArgs(
+                group=test_sg.id,
+            )],
+            networks=[openstack.compute.InstanceNetworkArgs(
+                name="my_network",
+            )])
         ```
 
         ### Compute service API version 2.64 or above:
@@ -268,6 +278,16 @@ def __init__(__self__,
             rules=openstack.compute.ServerGroupRulesArgs(
                 max_server_per_host=3,
             ))
+        test_instance = openstack.compute.Instance("test-instance",
+            name="my-instance",
+            image_id="ad091b52-742f-469e-8f3c-fd81cadf0743",
+            flavor_id="3",
+            scheduler_hints=[openstack.compute.InstanceSchedulerHintArgs(
+                group=test_sg.id,
+            )],
+            networks=[openstack.compute.InstanceNetworkArgs(
+                name="my_network",
+            )])
         ```
 
         ## Policies
@@ -330,6 +350,16 @@ def __init__(__self__,
         test_sg = openstack.compute.ServerGroup("test-sg",
             name="my-sg",
             policies=["anti-affinity"])
+        test_instance = openstack.compute.Instance("test-instance",
+            name="my-instance",
+            image_id="ad091b52-742f-469e-8f3c-fd81cadf0743",
+            flavor_id="3",
+            scheduler_hints=[openstack.compute.InstanceSchedulerHintArgs(
+                group=test_sg.id,
+            )],
+            networks=[openstack.compute.InstanceNetworkArgs(
+                name="my_network",
+            )])
         ```
 
         ### Compute service API version 2.64 or above:
@@ -344,6 +374,16 @@ def __init__(__self__,
             rules=openstack.compute.ServerGroupRulesArgs(
                 max_server_per_host=3,
             ))
+        test_instance = openstack.compute.Instance("test-instance",
+            name="my-instance",
+            image_id="ad091b52-742f-469e-8f3c-fd81cadf0743",
+            flavor_id="3",
+            scheduler_hints=[openstack.compute.InstanceSchedulerHintArgs(
+                group=test_sg.id,
+            )],
+            networks=[openstack.compute.InstanceNetworkArgs(
+                name="my_network",
+            )])
         ```
 
         ## Policies
diff --git a/sdk/python/pulumi_openstack/compute/volume_attach.py b/sdk/python/pulumi_openstack/compute/volume_attach.py
index 6fa5445c1..b4eca24a5 100644
--- a/sdk/python/pulumi_openstack/compute/volume_attach.py
+++ b/sdk/python/pulumi_openstack/compute/volume_attach.py
@@ -21,6 +21,7 @@ def __init__(__self__, *,
                  device: Optional[pulumi.Input[str]] = None,
                  multiattach: Optional[pulumi.Input[bool]] = None,
                  region: Optional[pulumi.Input[str]] = None,
+                 tag: Optional[pulumi.Input[str]] = None,
                  vendor_options: Optional[pulumi.Input['VolumeAttachVendorOptionsArgs']] = None):
         """
         The set of arguments for constructing a VolumeAttach resource.
@@ -31,6 +32,9 @@ def __init__(__self__, *,
                A Compute client is needed to create a volume attachment. If omitted, the
                `region` argument of the provider is used. Changing this creates a
                new volume attachment.
+        :param pulumi.Input[str] tag: Add a device role tag that is applied to the volume when
+               attaching it to the VM. Changing this creates a new volume attachment with
+               the new tag. Requires microversion >= 2.49.
         :param pulumi.Input['VolumeAttachVendorOptionsArgs'] vendor_options: Map of additional vendor-specific options.
                Supported options are described below.
         """
@@ -42,6 +46,8 @@ def __init__(__self__, *,
             pulumi.set(__self__, "multiattach", multiattach)
         if region is not None:
             pulumi.set(__self__, "region", region)
+        if tag is not None:
+            pulumi.set(__self__, "tag", tag)
         if vendor_options is not None:
             pulumi.set(__self__, "vendor_options", vendor_options)
 
@@ -105,6 +111,20 @@ def region(self) -> Optional[pulumi.Input[str]]:
     def region(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "region", value)
 
+    @property
+    @pulumi.getter
+    def tag(self) -> Optional[pulumi.Input[str]]:
+        """
+        Add a device role tag that is applied to the volume when
+        attaching it to the VM. Changing this creates a new volume attachment with
+        the new tag. Requires microversion >= 2.49.
+        """
+        return pulumi.get(self, "tag")
+
+    @tag.setter
+    def tag(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "tag", value)
+
     @property
     @pulumi.getter(name="vendorOptions")
     def vendor_options(self) -> Optional[pulumi.Input['VolumeAttachVendorOptionsArgs']]:
@@ -126,6 +146,7 @@ def __init__(__self__, *,
                  instance_id: Optional[pulumi.Input[str]] = None,
                  multiattach: Optional[pulumi.Input[bool]] = None,
                  region: Optional[pulumi.Input[str]] = None,
+                 tag: Optional[pulumi.Input[str]] = None,
                  vendor_options: Optional[pulumi.Input['VolumeAttachVendorOptionsArgs']] = None,
                  volume_id: Optional[pulumi.Input[str]] = None):
         """
@@ -136,6 +157,9 @@ def __init__(__self__, *,
                A Compute client is needed to create a volume attachment. If omitted, the
                `region` argument of the provider is used. Changing this creates a
                new volume attachment.
+        :param pulumi.Input[str] tag: Add a device role tag that is applied to the volume when
+               attaching it to the VM. Changing this creates a new volume attachment with
+               the new tag. Requires microversion >= 2.49.
         :param pulumi.Input['VolumeAttachVendorOptionsArgs'] vendor_options: Map of additional vendor-specific options.
                Supported options are described below.
         :param pulumi.Input[str] volume_id: The ID of the Volume to attach to an Instance.
@@ -148,6 +172,8 @@ def __init__(__self__, *,
             pulumi.set(__self__, "multiattach", multiattach)
         if region is not None:
             pulumi.set(__self__, "region", region)
+        if tag is not None:
+            pulumi.set(__self__, "tag", tag)
         if vendor_options is not None:
             pulumi.set(__self__, "vendor_options", vendor_options)
         if volume_id is not None:
@@ -201,6 +227,20 @@ def region(self) -> Optional[pulumi.Input[str]]:
     def region(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "region", value)
 
+    @property
+    @pulumi.getter
+    def tag(self) -> Optional[pulumi.Input[str]]:
+        """
+        Add a device role tag that is applied to the volume when
+        attaching it to the VM. Changing this creates a new volume attachment with
+        the new tag. Requires microversion >= 2.49.
+        """
+        return pulumi.get(self, "tag")
+
+    @tag.setter
+    def tag(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "tag", value)
+
     @property
     @pulumi.getter(name="vendorOptions")
     def vendor_options(self) -> Optional[pulumi.Input['VolumeAttachVendorOptionsArgs']]:
@@ -236,6 +276,7 @@ def __init__(__self__,
                  instance_id: Optional[pulumi.Input[str]] = None,
                  multiattach: Optional[pulumi.Input[bool]] = None,
                  region: Optional[pulumi.Input[str]] = None,
+                 tag: Optional[pulumi.Input[str]] = None,
                  vendor_options: Optional[pulumi.Input[pulumi.InputType['VolumeAttachVendorOptionsArgs']]] = None,
                  volume_id: Optional[pulumi.Input[str]] = None,
                  __props__=None):
@@ -265,7 +306,7 @@ def __init__(__self__,
         ### Using Multiattach-enabled volumes
 
         Multiattach Volumes are dependent upon your OpenStack cloud and not all
-        clouds support multiattach.
+        clouds support multiattach. Multiattach volumes require a volume_type that has [multiattach enabled](https://docs.openstack.org/cinder/latest/admin/volume-multiattach.html#multiattach-volume-type).
 
         ```python
         import pulumi
@@ -274,7 +315,7 @@ def __init__(__self__,
         volume1 = openstack.blockstorage.Volume("volume_1",
             name="volume_1",
             size=1,
-            multiattach=True)
+            volume_type="multiattach")
         instance1 = openstack.compute.Instance("instance_1",
             name="instance_1",
             security_groups=["default"])
@@ -312,6 +353,9 @@ def __init__(__self__,
                A Compute client is needed to create a volume attachment. If omitted, the
                `region` argument of the provider is used. Changing this creates a
                new volume attachment.
+        :param pulumi.Input[str] tag: Add a device role tag that is applied to the volume when
+               attaching it to the VM. Changing this creates a new volume attachment with
+               the new tag. Requires microversion >= 2.49.
         :param pulumi.Input[pulumi.InputType['VolumeAttachVendorOptionsArgs']] vendor_options: Map of additional vendor-specific options.
                Supported options are described below.
         :param pulumi.Input[str] volume_id: The ID of the Volume to attach to an Instance.
@@ -348,7 +392,7 @@ def __init__(__self__,
         ### Using Multiattach-enabled volumes
 
         Multiattach Volumes are dependent upon your OpenStack cloud and not all
-        clouds support multiattach.
+        clouds support multiattach. Multiattach volumes require a volume_type that has [multiattach enabled](https://docs.openstack.org/cinder/latest/admin/volume-multiattach.html#multiattach-volume-type).
 
         ```python
         import pulumi
@@ -357,7 +401,7 @@ def __init__(__self__,
         volume1 = openstack.blockstorage.Volume("volume_1",
             name="volume_1",
             size=1,
-            multiattach=True)
+            volume_type="multiattach")
         instance1 = openstack.compute.Instance("instance_1",
             name="instance_1",
             security_groups=["default"])
@@ -406,6 +450,7 @@ def _internal_init(__self__,
                  instance_id: Optional[pulumi.Input[str]] = None,
                  multiattach: Optional[pulumi.Input[bool]] = None,
                  region: Optional[pulumi.Input[str]] = None,
+                 tag: Optional[pulumi.Input[str]] = None,
                  vendor_options: Optional[pulumi.Input[pulumi.InputType['VolumeAttachVendorOptionsArgs']]] = None,
                  volume_id: Optional[pulumi.Input[str]] = None,
                  __props__=None):
@@ -423,6 +468,7 @@ def _internal_init(__self__,
             __props__.__dict__["instance_id"] = instance_id
             __props__.__dict__["multiattach"] = multiattach
             __props__.__dict__["region"] = region
+            __props__.__dict__["tag"] = tag
             __props__.__dict__["vendor_options"] = vendor_options
             if volume_id is None and not opts.urn:
                 raise TypeError("Missing required property 'volume_id'")
@@ -441,6 +487,7 @@ def get(resource_name: str,
             instance_id: Optional[pulumi.Input[str]] = None,
             multiattach: Optional[pulumi.Input[bool]] = None,
             region: Optional[pulumi.Input[str]] = None,
+            tag: Optional[pulumi.Input[str]] = None,
             vendor_options: Optional[pulumi.Input[pulumi.InputType['VolumeAttachVendorOptionsArgs']]] = None,
             volume_id: Optional[pulumi.Input[str]] = None) -> 'VolumeAttach':
         """
@@ -456,6 +503,9 @@ def get(resource_name: str,
                A Compute client is needed to create a volume attachment. If omitted, the
                `region` argument of the provider is used. Changing this creates a
                new volume attachment.
+        :param pulumi.Input[str] tag: Add a device role tag that is applied to the volume when
+               attaching it to the VM. Changing this creates a new volume attachment with
+               the new tag. Requires microversion >= 2.49.
         :param pulumi.Input[pulumi.InputType['VolumeAttachVendorOptionsArgs']] vendor_options: Map of additional vendor-specific options.
                Supported options are described below.
         :param pulumi.Input[str] volume_id: The ID of the Volume to attach to an Instance.
@@ -468,6 +518,7 @@ def get(resource_name: str,
         __props__.__dict__["instance_id"] = instance_id
         __props__.__dict__["multiattach"] = multiattach
         __props__.__dict__["region"] = region
+        __props__.__dict__["tag"] = tag
         __props__.__dict__["vendor_options"] = vendor_options
         __props__.__dict__["volume_id"] = volume_id
         return VolumeAttach(resource_name, opts=opts, __props__=__props__)
@@ -504,6 +555,16 @@ def region(self) -> pulumi.Output[str]:
         """
         return pulumi.get(self, "region")
 
+    @property
+    @pulumi.getter
+    def tag(self) -> pulumi.Output[Optional[str]]:
+        """
+        Add a device role tag that is applied to the volume when
+        attaching it to the VM. Changing this creates a new volume attachment with
+        the new tag. Requires microversion >= 2.49.
+        """
+        return pulumi.get(self, "tag")
+
     @property
     @pulumi.getter(name="vendorOptions")
     def vendor_options(self) -> pulumi.Output[Optional['outputs.VolumeAttachVendorOptions']]:
diff --git a/sdk/python/pulumi_openstack/config/__init__.pyi b/sdk/python/pulumi_openstack/config/__init__.pyi
index 4d765ba2d..145f17a23 100644
--- a/sdk/python/pulumi_openstack/config/__init__.pyi
+++ b/sdk/python/pulumi_openstack/config/__init__.pyi
@@ -148,11 +148,6 @@ token: Optional[str]
 Authentication token to use as an alternative to username/password.
 """
 
-useOctavia: Optional[bool]
-"""
-If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron).
-"""
-
 userDomainId: Optional[str]
 """
 The ID of the domain where the user resides (Identity v3).
diff --git a/sdk/python/pulumi_openstack/config/vars.py b/sdk/python/pulumi_openstack/config/vars.py
index b467c49bb..f3eebc175 100644
--- a/sdk/python/pulumi_openstack/config/vars.py
+++ b/sdk/python/pulumi_openstack/config/vars.py
@@ -210,13 +210,6 @@ def token(self) -> Optional[str]:
         """
         return __config__.get('token')
 
-    @property
-    def use_octavia(self) -> Optional[bool]:
-        """
-        If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron).
-        """
-        return __config__.get_bool('useOctavia') or _utilities.get_env_bool('OS_USE_OCTAVIA')
-
     @property
     def user_domain_id(self) -> Optional[str]:
         """
diff --git a/sdk/python/pulumi_openstack/images/get_image.py b/sdk/python/pulumi_openstack/images/get_image.py
index 9ffe1d603..a1c18c7ef 100644
--- a/sdk/python/pulumi_openstack/images/get_image.py
+++ b/sdk/python/pulumi_openstack/images/get_image.py
@@ -21,7 +21,7 @@ class GetImageResult:
     """
     A collection of values returned by getImage.
     """
-    def __init__(__self__, checksum=None, container_format=None, created_at=None, disk_format=None, file=None, hidden=None, id=None, member_status=None, metadata=None, min_disk_gb=None, min_ram_mb=None, most_recent=None, name=None, name_regex=None, owner=None, properties=None, protected=None, region=None, schema=None, size_bytes=None, size_max=None, size_min=None, sort_direction=None, sort_key=None, tag=None, tags=None, updated_at=None, visibility=None):
+    def __init__(__self__, checksum=None, container_format=None, created_at=None, disk_format=None, file=None, hidden=None, id=None, member_status=None, metadata=None, min_disk_gb=None, min_ram_mb=None, most_recent=None, name=None, name_regex=None, owner=None, properties=None, protected=None, region=None, schema=None, size_bytes=None, size_max=None, size_min=None, sort=None, tag=None, tags=None, updated_at=None, visibility=None):
         if checksum and not isinstance(checksum, str):
             raise TypeError("Expected argument 'checksum' to be a str")
         pulumi.set(__self__, "checksum", checksum)
@@ -88,12 +88,9 @@ def __init__(__self__, checksum=None, container_format=None, created_at=None, di
         if size_min and not isinstance(size_min, int):
             raise TypeError("Expected argument 'size_min' to be a int")
         pulumi.set(__self__, "size_min", size_min)
-        if sort_direction and not isinstance(sort_direction, str):
-            raise TypeError("Expected argument 'sort_direction' to be a str")
-        pulumi.set(__self__, "sort_direction", sort_direction)
-        if sort_key and not isinstance(sort_key, str):
-            raise TypeError("Expected argument 'sort_key' to be a str")
-        pulumi.set(__self__, "sort_key", sort_key)
+        if sort and not isinstance(sort, str):
+            raise TypeError("Expected argument 'sort' to be a str")
+        pulumi.set(__self__, "sort", sort)
         if tag and not isinstance(tag, str):
             raise TypeError("Expected argument 'tag' to be a str")
         pulumi.set(__self__, "tag", tag)
@@ -261,14 +258,9 @@ def size_min(self) -> Optional[int]:
         return pulumi.get(self, "size_min")
 
     @property
-    @pulumi.getter(name="sortDirection")
-    def sort_direction(self) -> Optional[str]:
-        return pulumi.get(self, "sort_direction")
-
-    @property
-    @pulumi.getter(name="sortKey")
-    def sort_key(self) -> Optional[str]:
-        return pulumi.get(self, "sort_key")
+    @pulumi.getter
+    def sort(self) -> Optional[str]:
+        return pulumi.get(self, "sort")
 
     @property
     @pulumi.getter
@@ -325,8 +317,7 @@ def __await__(self):
             size_bytes=self.size_bytes,
             size_max=self.size_max,
             size_min=self.size_min,
-            sort_direction=self.sort_direction,
-            sort_key=self.sort_key,
+            sort=self.sort,
             tag=self.tag,
             tags=self.tags,
             updated_at=self.updated_at,
@@ -343,8 +334,7 @@ def get_image(hidden: Optional[bool] = None,
               region: Optional[str] = None,
               size_max: Optional[int] = None,
               size_min: Optional[int] = None,
-              sort_direction: Optional[str] = None,
-              sort_key: Optional[str] = None,
+              sort: Optional[str] = None,
               tag: Optional[str] = None,
               tags: Optional[Sequence[str]] = None,
               visibility: Optional[str] = None,
@@ -389,8 +379,11 @@ def get_image(hidden: Optional[bool] = None,
            is used.
     :param int size_max: The maximum size (in bytes) of the image to return.
     :param int size_min: The minimum size (in bytes) of the image to return.
-    :param str sort_direction: Order the results in either `asc` or `desc`.
-    :param str sort_key: Sort images based on a certain key. Defaults to `name`.
+    :param str sort: Sorts the response by one or more attribute and sort
+           direction combinations. You can also set multiple sort keys and directions.
+           Default direction is `desc`. Use the comma (,) character to separate
+           multiple values. For example expression `sort = "name:asc,status"`
+           sorts ascending by name and descending by status.
     :param str tag: Search for images with a specific tag.
     :param Sequence[str] tags: A list of tags required to be set on the image 
            (all specified tags must be in the images tag list for it to be matched).
@@ -408,8 +401,7 @@ def get_image(hidden: Optional[bool] = None,
     __args__['region'] = region
     __args__['sizeMax'] = size_max
     __args__['sizeMin'] = size_min
-    __args__['sortDirection'] = sort_direction
-    __args__['sortKey'] = sort_key
+    __args__['sort'] = sort
     __args__['tag'] = tag
     __args__['tags'] = tags
     __args__['visibility'] = visibility
@@ -439,8 +431,7 @@ def get_image(hidden: Optional[bool] = None,
         size_bytes=pulumi.get(__ret__, 'size_bytes'),
         size_max=pulumi.get(__ret__, 'size_max'),
         size_min=pulumi.get(__ret__, 'size_min'),
-        sort_direction=pulumi.get(__ret__, 'sort_direction'),
-        sort_key=pulumi.get(__ret__, 'sort_key'),
+        sort=pulumi.get(__ret__, 'sort'),
         tag=pulumi.get(__ret__, 'tag'),
         tags=pulumi.get(__ret__, 'tags'),
         updated_at=pulumi.get(__ret__, 'updated_at'),
@@ -458,8 +449,7 @@ def get_image_output(hidden: Optional[pulumi.Input[Optional[bool]]] = None,
                      region: Optional[pulumi.Input[Optional[str]]] = None,
                      size_max: Optional[pulumi.Input[Optional[int]]] = None,
                      size_min: Optional[pulumi.Input[Optional[int]]] = None,
-                     sort_direction: Optional[pulumi.Input[Optional[str]]] = None,
-                     sort_key: Optional[pulumi.Input[Optional[str]]] = None,
+                     sort: Optional[pulumi.Input[Optional[str]]] = None,
                      tag: Optional[pulumi.Input[Optional[str]]] = None,
                      tags: Optional[pulumi.Input[Optional[Sequence[str]]]] = None,
                      visibility: Optional[pulumi.Input[Optional[str]]] = None,
@@ -504,8 +494,11 @@ def get_image_output(hidden: Optional[pulumi.Input[Optional[bool]]] = None,
            is used.
     :param int size_max: The maximum size (in bytes) of the image to return.
     :param int size_min: The minimum size (in bytes) of the image to return.
-    :param str sort_direction: Order the results in either `asc` or `desc`.
-    :param str sort_key: Sort images based on a certain key. Defaults to `name`.
+    :param str sort: Sorts the response by one or more attribute and sort
+           direction combinations. You can also set multiple sort keys and directions.
+           Default direction is `desc`. Use the comma (,) character to separate
+           multiple values. For example expression `sort = "name:asc,status"`
+           sorts ascending by name and descending by status.
     :param str tag: Search for images with a specific tag.
     :param Sequence[str] tags: A list of tags required to be set on the image 
            (all specified tags must be in the images tag list for it to be matched).
diff --git a/sdk/python/pulumi_openstack/images/get_image_ids.py b/sdk/python/pulumi_openstack/images/get_image_ids.py
index cfe832def..9d1b25b7f 100644
--- a/sdk/python/pulumi_openstack/images/get_image_ids.py
+++ b/sdk/python/pulumi_openstack/images/get_image_ids.py
@@ -21,7 +21,7 @@ class GetImageIdsResult:
     """
     A collection of values returned by getImageIds.
     """
-    def __init__(__self__, id=None, ids=None, member_status=None, name=None, name_regex=None, owner=None, properties=None, region=None, size_max=None, size_min=None, sort=None, sort_direction=None, sort_key=None, tag=None, tags=None, visibility=None):
+    def __init__(__self__, id=None, ids=None, member_status=None, name=None, name_regex=None, owner=None, properties=None, region=None, size_max=None, size_min=None, sort=None, tag=None, tags=None, visibility=None):
         if id and not isinstance(id, str):
             raise TypeError("Expected argument 'id' to be a str")
         pulumi.set(__self__, "id", id)
@@ -55,12 +55,6 @@ def __init__(__self__, id=None, ids=None, member_status=None, name=None, name_re
         if sort and not isinstance(sort, str):
             raise TypeError("Expected argument 'sort' to be a str")
         pulumi.set(__self__, "sort", sort)
-        if sort_direction and not isinstance(sort_direction, str):
-            raise TypeError("Expected argument 'sort_direction' to be a str")
-        pulumi.set(__self__, "sort_direction", sort_direction)
-        if sort_key and not isinstance(sort_key, str):
-            raise TypeError("Expected argument 'sort_key' to be a str")
-        pulumi.set(__self__, "sort_key", sort_key)
         if tag and not isinstance(tag, str):
             raise TypeError("Expected argument 'tag' to be a str")
         pulumi.set(__self__, "tag", tag)
@@ -129,22 +123,6 @@ def size_min(self) -> Optional[int]:
     def sort(self) -> Optional[str]:
         return pulumi.get(self, "sort")
 
-    @property
-    @pulumi.getter(name="sortDirection")
-    def sort_direction(self) -> Optional[str]:
-        warnings.warn("""Use option 'sort' instead.""", DeprecationWarning)
-        pulumi.log.warn("""sort_direction is deprecated: Use option 'sort' instead.""")
-
-        return pulumi.get(self, "sort_direction")
-
-    @property
-    @pulumi.getter(name="sortKey")
-    def sort_key(self) -> Optional[str]:
-        warnings.warn("""Use option 'sort' instead.""", DeprecationWarning)
-        pulumi.log.warn("""sort_key is deprecated: Use option 'sort' instead.""")
-
-        return pulumi.get(self, "sort_key")
-
     @property
     @pulumi.getter
     def tag(self) -> Optional[str]:
@@ -178,8 +156,6 @@ def __await__(self):
             size_max=self.size_max,
             size_min=self.size_min,
             sort=self.sort,
-            sort_direction=self.sort_direction,
-            sort_key=self.sort_key,
             tag=self.tag,
             tags=self.tags,
             visibility=self.visibility)
@@ -194,8 +170,6 @@ def get_image_ids(member_status: Optional[str] = None,
                   size_max: Optional[int] = None,
                   size_min: Optional[int] = None,
                   sort: Optional[str] = None,
-                  sort_direction: Optional[str] = None,
-                  sort_key: Optional[str] = None,
                   tag: Optional[str] = None,
                   tags: Optional[Sequence[str]] = None,
                   visibility: Optional[str] = None,
@@ -240,14 +214,7 @@ def get_image_ids(member_status: Optional[str] = None,
            direction combinations. You can also set multiple sort keys and directions.
            Default direction is `desc`. Use the comma (,) character to separate
            multiple values. For example expression `sort = "name:asc,status"`
-           sorts ascending by name and descending by status. `sort` cannot be used
-           simultaneously with `sort_key`. If both are present in a configuration
-           then only `sort` will be used.
-    :param str sort_direction: Order the results in either `asc` or `desc`.
-           Can be applied only with `sort_key`. Defaults to `asc`
-    :param str sort_key: Sort images based on a certain key. Defaults to
-           `name`. `sort_key` cannot be used simultaneously with `sort`. If both
-           are present in a configuration then only `sort` will be used.
+           sorts ascending by name and descending by status.
     :param str tag: Search for images with a specific tag.
     :param Sequence[str] tags: A list of tags required to be set on the image
            (all specified tags must be in the images tag list for it to be matched).
@@ -264,8 +231,6 @@ def get_image_ids(member_status: Optional[str] = None,
     __args__['sizeMax'] = size_max
     __args__['sizeMin'] = size_min
     __args__['sort'] = sort
-    __args__['sortDirection'] = sort_direction
-    __args__['sortKey'] = sort_key
     __args__['tag'] = tag
     __args__['tags'] = tags
     __args__['visibility'] = visibility
@@ -284,8 +249,6 @@ def get_image_ids(member_status: Optional[str] = None,
         size_max=pulumi.get(__ret__, 'size_max'),
         size_min=pulumi.get(__ret__, 'size_min'),
         sort=pulumi.get(__ret__, 'sort'),
-        sort_direction=pulumi.get(__ret__, 'sort_direction'),
-        sort_key=pulumi.get(__ret__, 'sort_key'),
         tag=pulumi.get(__ret__, 'tag'),
         tags=pulumi.get(__ret__, 'tags'),
         visibility=pulumi.get(__ret__, 'visibility'))
@@ -301,8 +264,6 @@ def get_image_ids_output(member_status: Optional[pulumi.Input[Optional[str]]] =
                          size_max: Optional[pulumi.Input[Optional[int]]] = None,
                          size_min: Optional[pulumi.Input[Optional[int]]] = None,
                          sort: Optional[pulumi.Input[Optional[str]]] = None,
-                         sort_direction: Optional[pulumi.Input[Optional[str]]] = None,
-                         sort_key: Optional[pulumi.Input[Optional[str]]] = None,
                          tag: Optional[pulumi.Input[Optional[str]]] = None,
                          tags: Optional[pulumi.Input[Optional[Sequence[str]]]] = None,
                          visibility: Optional[pulumi.Input[Optional[str]]] = None,
@@ -347,14 +308,7 @@ def get_image_ids_output(member_status: Optional[pulumi.Input[Optional[str]]] =
            direction combinations. You can also set multiple sort keys and directions.
            Default direction is `desc`. Use the comma (,) character to separate
            multiple values. For example expression `sort = "name:asc,status"`
-           sorts ascending by name and descending by status. `sort` cannot be used
-           simultaneously with `sort_key`. If both are present in a configuration
-           then only `sort` will be used.
-    :param str sort_direction: Order the results in either `asc` or `desc`.
-           Can be applied only with `sort_key`. Defaults to `asc`
-    :param str sort_key: Sort images based on a certain key. Defaults to
-           `name`. `sort_key` cannot be used simultaneously with `sort`. If both
-           are present in a configuration then only `sort` will be used.
+           sorts ascending by name and descending by status.
     :param str tag: Search for images with a specific tag.
     :param Sequence[str] tags: A list of tags required to be set on the image
            (all specified tags must be in the images tag list for it to be matched).
diff --git a/sdk/python/pulumi_openstack/images/image.py b/sdk/python/pulumi_openstack/images/image.py
index 4b62c1ca3..2ef72dde6 100644
--- a/sdk/python/pulumi_openstack/images/image.py
+++ b/sdk/python/pulumi_openstack/images/image.py
@@ -415,7 +415,6 @@ def __init__(__self__, *,
                  size_bytes: Optional[pulumi.Input[int]] = None,
                  status: Optional[pulumi.Input[str]] = None,
                  tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
-                 update_at: Optional[pulumi.Input[str]] = None,
                  updated_at: Optional[pulumi.Input[str]] = None,
                  verify_checksum: Optional[pulumi.Input[bool]] = None,
                  visibility: Optional[pulumi.Input[str]] = None,
@@ -473,7 +472,6 @@ def __init__(__self__, *,
                or "saving".
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: The tags of the image. It must be a list of strings.
                At this time, it is not possible to delete all tags of an image.
-        :param pulumi.Input[str] update_at: (**Deprecated** - use `updated_at` instead)
         :param pulumi.Input[str] updated_at: The date the image was last updated.
         :param pulumi.Input[bool] verify_checksum: If false, the checksum will not be verified
                once the image is finished uploading. Conflicts with `web_download`.
@@ -535,11 +533,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "status", status)
         if tags is not None:
             pulumi.set(__self__, "tags", tags)
-        if update_at is not None:
-            warnings.warn("""Use updated_at instead""", DeprecationWarning)
-            pulumi.log.warn("""update_at is deprecated: Use updated_at instead""")
-        if update_at is not None:
-            pulumi.set(__self__, "update_at", update_at)
         if updated_at is not None:
             pulumi.set(__self__, "updated_at", updated_at)
         if verify_checksum is not None:
@@ -873,21 +866,6 @@ def tags(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
     def tags(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]):
         pulumi.set(self, "tags", value)
 
-    @property
-    @pulumi.getter(name="updateAt")
-    def update_at(self) -> Optional[pulumi.Input[str]]:
-        """
-        (**Deprecated** - use `updated_at` instead)
-        """
-        warnings.warn("""Use updated_at instead""", DeprecationWarning)
-        pulumi.log.warn("""update_at is deprecated: Use updated_at instead""")
-
-        return pulumi.get(self, "update_at")
-
-    @update_at.setter
-    def update_at(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "update_at", value)
-
     @property
     @pulumi.getter(name="updatedAt")
     def updated_at(self) -> Optional[pulumi.Input[str]]:
@@ -1194,7 +1172,6 @@ def _internal_init(__self__,
             __props__.__dict__["schema"] = None
             __props__.__dict__["size_bytes"] = None
             __props__.__dict__["status"] = None
-            __props__.__dict__["update_at"] = None
             __props__.__dict__["updated_at"] = None
         secret_opts = pulumi.ResourceOptions(additional_secret_outputs=["imageSourcePassword"])
         opts = pulumi.ResourceOptions.merge(opts, secret_opts)
@@ -1233,7 +1210,6 @@ def get(resource_name: str,
             size_bytes: Optional[pulumi.Input[int]] = None,
             status: Optional[pulumi.Input[str]] = None,
             tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
-            update_at: Optional[pulumi.Input[str]] = None,
             updated_at: Optional[pulumi.Input[str]] = None,
             verify_checksum: Optional[pulumi.Input[bool]] = None,
             visibility: Optional[pulumi.Input[str]] = None,
@@ -1296,7 +1272,6 @@ def get(resource_name: str,
                or "saving".
         :param pulumi.Input[Sequence[pulumi.Input[str]]] tags: The tags of the image. It must be a list of strings.
                At this time, it is not possible to delete all tags of an image.
-        :param pulumi.Input[str] update_at: (**Deprecated** - use `updated_at` instead)
         :param pulumi.Input[str] updated_at: The date the image was last updated.
         :param pulumi.Input[bool] verify_checksum: If false, the checksum will not be verified
                once the image is finished uploading. Conflicts with `web_download`.
@@ -1337,7 +1312,6 @@ def get(resource_name: str,
         __props__.__dict__["size_bytes"] = size_bytes
         __props__.__dict__["status"] = status
         __props__.__dict__["tags"] = tags
-        __props__.__dict__["update_at"] = update_at
         __props__.__dict__["updated_at"] = updated_at
         __props__.__dict__["verify_checksum"] = verify_checksum
         __props__.__dict__["visibility"] = visibility
@@ -1568,17 +1542,6 @@ def tags(self) -> pulumi.Output[Optional[Sequence[str]]]:
         """
         return pulumi.get(self, "tags")
 
-    @property
-    @pulumi.getter(name="updateAt")
-    def update_at(self) -> pulumi.Output[str]:
-        """
-        (**Deprecated** - use `updated_at` instead)
-        """
-        warnings.warn("""Use updated_at instead""", DeprecationWarning)
-        pulumi.log.warn("""update_at is deprecated: Use updated_at instead""")
-
-        return pulumi.get(self, "update_at")
-
     @property
     @pulumi.getter(name="updatedAt")
     def updated_at(self) -> pulumi.Output[str]:
diff --git a/sdk/python/pulumi_openstack/loadbalancer/__init__.py b/sdk/python/pulumi_openstack/loadbalancer/__init__.py
index a901e9cb0..02f095cca 100644
--- a/sdk/python/pulumi_openstack/loadbalancer/__init__.py
+++ b/sdk/python/pulumi_openstack/loadbalancer/__init__.py
@@ -5,6 +5,7 @@
 from .. import _utilities
 import typing
 # Export this package's modules as members:
+from .get_flavor_v2 import *
 from .l7_policy_v2 import *
 from .l7_rule_v2 import *
 from .listener import *
diff --git a/sdk/python/pulumi_openstack/loadbalancer/get_flavor_v2.py b/sdk/python/pulumi_openstack/loadbalancer/get_flavor_v2.py
new file mode 100644
index 000000000..eb20e936d
--- /dev/null
+++ b/sdk/python/pulumi_openstack/loadbalancer/get_flavor_v2.py
@@ -0,0 +1,133 @@
+# coding=utf-8
+# *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
+# *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+import copy
+import warnings
+import pulumi
+import pulumi.runtime
+from typing import Any, Mapping, Optional, Sequence, Union, overload
+from .. import _utilities
+
+__all__ = [
+    'GetFlavorV2Result',
+    'AwaitableGetFlavorV2Result',
+    'get_flavor_v2',
+    'get_flavor_v2_output',
+]
+
+@pulumi.output_type
+class GetFlavorV2Result:
+    """
+    A collection of values returned by getFlavorV2.
+    """
+    def __init__(__self__, description=None, enabled=None, flavor_id=None, flavor_profile_id=None, id=None, name=None, region=None):
+        if description and not isinstance(description, str):
+            raise TypeError("Expected argument 'description' to be a str")
+        pulumi.set(__self__, "description", description)
+        if enabled and not isinstance(enabled, bool):
+            raise TypeError("Expected argument 'enabled' to be a bool")
+        pulumi.set(__self__, "enabled", enabled)
+        if flavor_id and not isinstance(flavor_id, str):
+            raise TypeError("Expected argument 'flavor_id' to be a str")
+        pulumi.set(__self__, "flavor_id", flavor_id)
+        if flavor_profile_id and not isinstance(flavor_profile_id, str):
+            raise TypeError("Expected argument 'flavor_profile_id' to be a str")
+        pulumi.set(__self__, "flavor_profile_id", flavor_profile_id)
+        if id and not isinstance(id, str):
+            raise TypeError("Expected argument 'id' to be a str")
+        pulumi.set(__self__, "id", id)
+        if name and not isinstance(name, str):
+            raise TypeError("Expected argument 'name' to be a str")
+        pulumi.set(__self__, "name", name)
+        if region and not isinstance(region, str):
+            raise TypeError("Expected argument 'region' to be a str")
+        pulumi.set(__self__, "region", region)
+
+    @property
+    @pulumi.getter
+    def description(self) -> str:
+        return pulumi.get(self, "description")
+
+    @property
+    @pulumi.getter
+    def enabled(self) -> bool:
+        return pulumi.get(self, "enabled")
+
+    @property
+    @pulumi.getter(name="flavorId")
+    def flavor_id(self) -> str:
+        return pulumi.get(self, "flavor_id")
+
+    @property
+    @pulumi.getter(name="flavorProfileId")
+    def flavor_profile_id(self) -> str:
+        return pulumi.get(self, "flavor_profile_id")
+
+    @property
+    @pulumi.getter
+    def id(self) -> str:
+        """
+        The provider-assigned unique ID for this managed resource.
+        """
+        return pulumi.get(self, "id")
+
+    @property
+    @pulumi.getter
+    def name(self) -> str:
+        return pulumi.get(self, "name")
+
+    @property
+    @pulumi.getter
+    def region(self) -> Optional[str]:
+        return pulumi.get(self, "region")
+
+
+class AwaitableGetFlavorV2Result(GetFlavorV2Result):
+    # pylint: disable=using-constant-test
+    def __await__(self):
+        if False:
+            yield self
+        return GetFlavorV2Result(
+            description=self.description,
+            enabled=self.enabled,
+            flavor_id=self.flavor_id,
+            flavor_profile_id=self.flavor_profile_id,
+            id=self.id,
+            name=self.name,
+            region=self.region)
+
+
+def get_flavor_v2(flavor_id: Optional[str] = None,
+                  name: Optional[str] = None,
+                  region: Optional[str] = None,
+                  opts: Optional[pulumi.InvokeOptions] = None) -> AwaitableGetFlavorV2Result:
+    """
+    Use this data source to access information about an existing resource.
+    """
+    __args__ = dict()
+    __args__['flavorId'] = flavor_id
+    __args__['name'] = name
+    __args__['region'] = region
+    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    __ret__ = pulumi.runtime.invoke('openstack:loadbalancer/getFlavorV2:getFlavorV2', __args__, opts=opts, typ=GetFlavorV2Result).value
+
+    return AwaitableGetFlavorV2Result(
+        description=pulumi.get(__ret__, 'description'),
+        enabled=pulumi.get(__ret__, 'enabled'),
+        flavor_id=pulumi.get(__ret__, 'flavor_id'),
+        flavor_profile_id=pulumi.get(__ret__, 'flavor_profile_id'),
+        id=pulumi.get(__ret__, 'id'),
+        name=pulumi.get(__ret__, 'name'),
+        region=pulumi.get(__ret__, 'region'))
+
+
+@_utilities.lift_output_func(get_flavor_v2)
+def get_flavor_v2_output(flavor_id: Optional[pulumi.Input[Optional[str]]] = None,
+                         name: Optional[pulumi.Input[Optional[str]]] = None,
+                         region: Optional[pulumi.Input[Optional[str]]] = None,
+                         opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetFlavorV2Result]:
+    """
+    Use this data source to access information about an existing resource.
+    """
+    ...
diff --git a/sdk/python/pulumi_openstack/loadbalancer/listener.py b/sdk/python/pulumi_openstack/loadbalancer/listener.py
index 6d8492761..5a720cf3a 100644
--- a/sdk/python/pulumi_openstack/loadbalancer/listener.py
+++ b/sdk/python/pulumi_openstack/loadbalancer/listener.py
@@ -38,8 +38,8 @@ def __init__(__self__, *,
         :param pulumi.Input[str] loadbalancer_id: The load balancer on which to provision this
                Listener. Changing this creates a new Listener.
         :param pulumi.Input[str] protocol: The protocol - can either be TCP, HTTP, HTTPS,
-               TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-               in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+               TERMINATED_HTTPS, UDP, SCTP (supported only in
+               **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
                **Octavia minor version >=2.25**). Changing this creates a new Listener.
         :param pulumi.Input[int] protocol_port: The port on which to listen for client traffic.
                Changing this creates a new Listener.
@@ -133,8 +133,8 @@ def loadbalancer_id(self, value: pulumi.Input[str]):
     def protocol(self) -> pulumi.Input[str]:
         """
         The protocol - can either be TCP, HTTP, HTTPS,
-        TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-        in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+        TERMINATED_HTTPS, UDP, SCTP (supported only in
+        **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
         **Octavia minor version >=2.25**). Changing this creates a new Listener.
         """
         return pulumi.get(self, "protocol")
@@ -412,8 +412,8 @@ def __init__(__self__, *,
         :param pulumi.Input[str] name: Human-readable name for the Listener. Does not have
                to be unique.
         :param pulumi.Input[str] protocol: The protocol - can either be TCP, HTTP, HTTPS,
-               TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-               in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+               TERMINATED_HTTPS, UDP, SCTP (supported only in
+               **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
                **Octavia minor version >=2.25**). Changing this creates a new Listener.
         :param pulumi.Input[int] protocol_port: The port on which to listen for client traffic.
                Changing this creates a new Listener.
@@ -598,8 +598,8 @@ def name(self, value: Optional[pulumi.Input[str]]):
     def protocol(self) -> Optional[pulumi.Input[str]]:
         """
         The protocol - can either be TCP, HTTP, HTTPS,
-        TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-        in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+        TERMINATED_HTTPS, UDP, SCTP (supported only in
+        **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
         **Octavia minor version >=2.25**). Changing this creates a new Listener.
         """
         return pulumi.get(self, "protocol")
@@ -802,8 +802,8 @@ def __init__(__self__,
         :param pulumi.Input[str] name: Human-readable name for the Listener. Does not have
                to be unique.
         :param pulumi.Input[str] protocol: The protocol - can either be TCP, HTTP, HTTPS,
-               TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-               in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+               TERMINATED_HTTPS, UDP, SCTP (supported only in
+               **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
                **Octavia minor version >=2.25**). Changing this creates a new Listener.
         :param pulumi.Input[int] protocol_port: The port on which to listen for client traffic.
                Changing this creates a new Listener.
@@ -985,8 +985,8 @@ def get(resource_name: str,
         :param pulumi.Input[str] name: Human-readable name for the Listener. Does not have
                to be unique.
         :param pulumi.Input[str] protocol: The protocol - can either be TCP, HTTP, HTTPS,
-               TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-               in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+               TERMINATED_HTTPS, UDP, SCTP (supported only in
+               **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
                **Octavia minor version >=2.25**). Changing this creates a new Listener.
         :param pulumi.Input[int] protocol_port: The port on which to listen for client traffic.
                Changing this creates a new Listener.
@@ -1121,8 +1121,8 @@ def name(self) -> pulumi.Output[str]:
     def protocol(self) -> pulumi.Output[str]:
         """
         The protocol - can either be TCP, HTTP, HTTPS,
-        TERMINATED_HTTPS, UDP (supported only in Octavia), SCTP (supported only
-        in **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
+        TERMINATED_HTTPS, UDP, SCTP (supported only in
+        **Octavia minor version >= 2.23**) or PROMETHEUS (supported only in
         **Octavia minor version >=2.25**). Changing this creates a new Listener.
         """
         return pulumi.get(self, "protocol")
diff --git a/sdk/python/pulumi_openstack/loadbalancer/members.py b/sdk/python/pulumi_openstack/loadbalancer/members.py
index abbbeb760..0e8fb64ea 100644
--- a/sdk/python/pulumi_openstack/loadbalancer/members.py
+++ b/sdk/python/pulumi_openstack/loadbalancer/members.py
@@ -159,10 +159,6 @@ def __init__(__self__,
         > **Note:** This resource has attributes that depend on octavia minor versions.
         Please ensure your Openstack cloud supports the required minor version.
 
-        > **Note:** This resource works only within Octavia API. For
-        legacy Neutron LBaaS v2 extension please use
-        loadbalancer.Member resource.
-
         ## Example Usage
 
         ```python
@@ -214,10 +210,6 @@ def __init__(__self__,
         > **Note:** This resource has attributes that depend on octavia minor versions.
         Please ensure your Openstack cloud supports the required minor version.
 
-        > **Note:** This resource works only within Octavia API. For
-        legacy Neutron LBaaS v2 extension please use
-        loadbalancer.Member resource.
-
         ## Example Usage
 
         ```python
diff --git a/sdk/python/pulumi_openstack/loadbalancer/pool.py b/sdk/python/pulumi_openstack/loadbalancer/pool.py
index 5e9f57df6..668140587 100644
--- a/sdk/python/pulumi_openstack/loadbalancer/pool.py
+++ b/sdk/python/pulumi_openstack/loadbalancer/pool.py
@@ -30,11 +30,10 @@ def __init__(__self__, *,
         The set of arguments for constructing a Pool resource.
         :param pulumi.Input[str] lb_method: The load balancing algorithm to
                distribute traffic to the pool's members. Must be one of
-               ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-               in Octavia).
+               ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
         :param pulumi.Input[str] protocol: The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-               UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-               or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+               UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+               (**Octavia minor version >= 2.23**). Changing this creates a new pool.
         :param pulumi.Input[bool] admin_state_up: The administrative state of the pool.
                A valid value is true (UP) or false (DOWN).
         :param pulumi.Input[str] description: Human-readable description for the pool.
@@ -81,8 +80,7 @@ def lb_method(self) -> pulumi.Input[str]:
         """
         The load balancing algorithm to
         distribute traffic to the pool's members. Must be one of
-        ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-        in Octavia).
+        ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
         """
         return pulumi.get(self, "lb_method")
 
@@ -95,8 +93,8 @@ def lb_method(self, value: pulumi.Input[str]):
     def protocol(self) -> pulumi.Input[str]:
         """
         The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-        UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-        or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+        UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+        (**Octavia minor version >= 2.23**). Changing this creates a new pool.
         """
         return pulumi.get(self, "protocol")
 
@@ -233,8 +231,7 @@ def __init__(__self__, *,
         :param pulumi.Input[str] description: Human-readable description for the pool.
         :param pulumi.Input[str] lb_method: The load balancing algorithm to
                distribute traffic to the pool's members. Must be one of
-               ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-               in Octavia).
+               ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
         :param pulumi.Input[str] listener_id: The Listener on which the members of the pool
                will be associated with. Changing this creates a new pool.
                Note:  One of LoadbalancerID or ListenerID must be provided.
@@ -246,8 +243,8 @@ def __init__(__self__, *,
                whether connections in the same session will be processed by the same Pool
                member or not. Changing this creates a new pool.
         :param pulumi.Input[str] protocol: The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-               UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-               or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+               UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+               (**Octavia minor version >= 2.23**). Changing this creates a new pool.
         :param pulumi.Input[str] region: The region in which to obtain the V2 Networking client.
                A Networking client is needed to create an . If omitted, the
                `region` argument of the provider is used. Changing this creates a new
@@ -308,8 +305,7 @@ def lb_method(self) -> Optional[pulumi.Input[str]]:
         """
         The load balancing algorithm to
         distribute traffic to the pool's members. Must be one of
-        ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-        in Octavia).
+        ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
         """
         return pulumi.get(self, "lb_method")
 
@@ -376,8 +372,8 @@ def persistence(self, value: Optional[pulumi.Input['PoolPersistenceArgs']]):
     def protocol(self) -> Optional[pulumi.Input[str]]:
         """
         The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-        UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-        or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+        UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+        (**Octavia minor version >= 2.23**). Changing this creates a new pool.
         """
         return pulumi.get(self, "protocol")
 
@@ -468,8 +464,7 @@ def __init__(__self__,
         :param pulumi.Input[str] description: Human-readable description for the pool.
         :param pulumi.Input[str] lb_method: The load balancing algorithm to
                distribute traffic to the pool's members. Must be one of
-               ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-               in Octavia).
+               ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
         :param pulumi.Input[str] listener_id: The Listener on which the members of the pool
                will be associated with. Changing this creates a new pool.
                Note:  One of LoadbalancerID or ListenerID must be provided.
@@ -481,8 +476,8 @@ def __init__(__self__,
                whether connections in the same session will be processed by the same Pool
                member or not. Changing this creates a new pool.
         :param pulumi.Input[str] protocol: The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-               UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-               or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+               UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+               (**Octavia minor version >= 2.23**). Changing this creates a new pool.
         :param pulumi.Input[str] region: The region in which to obtain the V2 Networking client.
                A Networking client is needed to create an . If omitted, the
                `region` argument of the provider is used. Changing this creates a new
@@ -607,8 +602,7 @@ def get(resource_name: str,
         :param pulumi.Input[str] description: Human-readable description for the pool.
         :param pulumi.Input[str] lb_method: The load balancing algorithm to
                distribute traffic to the pool's members. Must be one of
-               ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-               in Octavia).
+               ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
         :param pulumi.Input[str] listener_id: The Listener on which the members of the pool
                will be associated with. Changing this creates a new pool.
                Note:  One of LoadbalancerID or ListenerID must be provided.
@@ -620,8 +614,8 @@ def get(resource_name: str,
                whether connections in the same session will be processed by the same Pool
                member or not. Changing this creates a new pool.
         :param pulumi.Input[str] protocol: The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-               UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-               or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+               UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+               (**Octavia minor version >= 2.23**). Changing this creates a new pool.
         :param pulumi.Input[str] region: The region in which to obtain the V2 Networking client.
                A Networking client is needed to create an . If omitted, the
                `region` argument of the provider is used. Changing this creates a new
@@ -669,8 +663,7 @@ def lb_method(self) -> pulumi.Output[str]:
         """
         The load balancing algorithm to
         distribute traffic to the pool's members. Must be one of
-        ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT (supported only
-        in Octavia).
+        ROUND_ROBIN, LEAST_CONNECTIONS, SOURCE_IP, or SOURCE_IP_PORT.
         """
         return pulumi.get(self, "lb_method")
 
@@ -717,8 +710,8 @@ def persistence(self) -> pulumi.Output['outputs.PoolPersistence']:
     def protocol(self) -> pulumi.Output[str]:
         """
         The protocol - can either be TCP, HTTP, HTTPS, PROXY,
-        UDP (supported only in Octavia), PROXYV2 (**Octavia minor version >= 2.22**)
-        or SCTP (**Octavia minor version >= 2.23**). Changing this creates a new pool.
+        UDP, PROXYV2 (**Octavia minor version >= 2.22**) or SCTP
+        (**Octavia minor version >= 2.23**). Changing this creates a new pool.
         """
         return pulumi.get(self, "protocol")
 
diff --git a/sdk/python/pulumi_openstack/loadbalancer/pool_v1.py b/sdk/python/pulumi_openstack/loadbalancer/pool_v1.py
index 04035cdcb..19c1acf9e 100644
--- a/sdk/python/pulumi_openstack/loadbalancer/pool_v1.py
+++ b/sdk/python/pulumi_openstack/loadbalancer/pool_v1.py
@@ -18,7 +18,6 @@ def __init__(__self__, *,
                  protocol: pulumi.Input[str],
                  subnet_id: pulumi.Input[str],
                  lb_provider: Optional[pulumi.Input[str]] = None,
-                 members: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  monitor_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  region: Optional[pulumi.Input[str]] = None,
@@ -35,10 +34,6 @@ def __init__(__self__, *,
                Changing this creates a new pool.
         :param pulumi.Input[str] lb_provider: The backend load balancing provider. For example:
                `haproxy`, `F5`, etc.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] members: An existing node to add to the pool. Changing this
-               updates the members of the pool. The member object structure is documented
-               below. Please note that the `member` block is deprecated in favor of the
-               `loadbalancer.MemberV1` resource.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] monitor_ids: A list of IDs of monitors to associate with the
                pool.
         :param pulumi.Input[str] name: The name of the pool. Changing this updates the name of
@@ -55,11 +50,6 @@ def __init__(__self__, *,
         pulumi.set(__self__, "subnet_id", subnet_id)
         if lb_provider is not None:
             pulumi.set(__self__, "lb_provider", lb_provider)
-        if members is not None:
-            warnings.warn("""Use loadbalancer.MemberV1 instead""", DeprecationWarning)
-            pulumi.log.warn("""members is deprecated: Use loadbalancer.MemberV1 instead""")
-        if members is not None:
-            pulumi.set(__self__, "members", members)
         if monitor_ids is not None:
             pulumi.set(__self__, "monitor_ids", monitor_ids)
         if name is not None:
@@ -123,24 +113,6 @@ def lb_provider(self) -> Optional[pulumi.Input[str]]:
     def lb_provider(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "lb_provider", value)
 
-    @property
-    @pulumi.getter
-    def members(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
-        """
-        An existing node to add to the pool. Changing this
-        updates the members of the pool. The member object structure is documented
-        below. Please note that the `member` block is deprecated in favor of the
-        `loadbalancer.MemberV1` resource.
-        """
-        warnings.warn("""Use loadbalancer.MemberV1 instead""", DeprecationWarning)
-        pulumi.log.warn("""members is deprecated: Use loadbalancer.MemberV1 instead""")
-
-        return pulumi.get(self, "members")
-
-    @members.setter
-    def members(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]):
-        pulumi.set(self, "members", value)
-
     @property
     @pulumi.getter(name="monitorIds")
     def monitor_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
@@ -201,7 +173,6 @@ class _PoolV1State:
     def __init__(__self__, *,
                  lb_method: Optional[pulumi.Input[str]] = None,
                  lb_provider: Optional[pulumi.Input[str]] = None,
-                 members: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  monitor_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  protocol: Optional[pulumi.Input[str]] = None,
@@ -215,10 +186,6 @@ def __init__(__self__, *,
                'LEAST_CONNECTIONS' as valid values for this attribute.
         :param pulumi.Input[str] lb_provider: The backend load balancing provider. For example:
                `haproxy`, `F5`, etc.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] members: An existing node to add to the pool. Changing this
-               updates the members of the pool. The member object structure is documented
-               below. Please note that the `member` block is deprecated in favor of the
-               `loadbalancer.MemberV1` resource.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] monitor_ids: A list of IDs of monitors to associate with the
                pool.
         :param pulumi.Input[str] name: The name of the pool. Changing this updates the name of
@@ -239,11 +206,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "lb_method", lb_method)
         if lb_provider is not None:
             pulumi.set(__self__, "lb_provider", lb_provider)
-        if members is not None:
-            warnings.warn("""Use loadbalancer.MemberV1 instead""", DeprecationWarning)
-            pulumi.log.warn("""members is deprecated: Use loadbalancer.MemberV1 instead""")
-        if members is not None:
-            pulumi.set(__self__, "members", members)
         if monitor_ids is not None:
             pulumi.set(__self__, "monitor_ids", monitor_ids)
         if name is not None:
@@ -284,24 +246,6 @@ def lb_provider(self) -> Optional[pulumi.Input[str]]:
     def lb_provider(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "lb_provider", value)
 
-    @property
-    @pulumi.getter
-    def members(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
-        """
-        An existing node to add to the pool. Changing this
-        updates the members of the pool. The member object structure is documented
-        below. Please note that the `member` block is deprecated in favor of the
-        `loadbalancer.MemberV1` resource.
-        """
-        warnings.warn("""Use loadbalancer.MemberV1 instead""", DeprecationWarning)
-        pulumi.log.warn("""members is deprecated: Use loadbalancer.MemberV1 instead""")
-
-        return pulumi.get(self, "members")
-
-    @members.setter
-    def members(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]):
-        pulumi.set(self, "members", value)
-
     @property
     @pulumi.getter(name="monitorIds")
     def monitor_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
@@ -391,7 +335,6 @@ def __init__(__self__,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  lb_method: Optional[pulumi.Input[str]] = None,
                  lb_provider: Optional[pulumi.Input[str]] = None,
-                 members: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  monitor_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  protocol: Optional[pulumi.Input[str]] = None,
@@ -493,10 +436,6 @@ def __init__(__self__,
             pool_id=pool1.id)
         ```
 
-        ## Notes
-
-        The `member` block is deprecated in favor of the `loadbalancer.MemberV1` resource.
-
         ## Import
 
         Load Balancer Pools can be imported using the `id`, e.g.
@@ -512,10 +451,6 @@ def __init__(__self__,
                'LEAST_CONNECTIONS' as valid values for this attribute.
         :param pulumi.Input[str] lb_provider: The backend load balancing provider. For example:
                `haproxy`, `F5`, etc.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] members: An existing node to add to the pool. Changing this
-               updates the members of the pool. The member object structure is documented
-               below. Please note that the `member` block is deprecated in favor of the
-               `loadbalancer.MemberV1` resource.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] monitor_ids: A list of IDs of monitors to associate with the
                pool.
         :param pulumi.Input[str] name: The name of the pool. Changing this updates the name of
@@ -632,10 +567,6 @@ def __init__(__self__,
             pool_id=pool1.id)
         ```
 
-        ## Notes
-
-        The `member` block is deprecated in favor of the `loadbalancer.MemberV1` resource.
-
         ## Import
 
         Load Balancer Pools can be imported using the `id`, e.g.
@@ -661,7 +592,6 @@ def _internal_init(__self__,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  lb_method: Optional[pulumi.Input[str]] = None,
                  lb_provider: Optional[pulumi.Input[str]] = None,
-                 members: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  monitor_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  protocol: Optional[pulumi.Input[str]] = None,
@@ -681,7 +611,6 @@ def _internal_init(__self__,
                 raise TypeError("Missing required property 'lb_method'")
             __props__.__dict__["lb_method"] = lb_method
             __props__.__dict__["lb_provider"] = lb_provider
-            __props__.__dict__["members"] = members
             __props__.__dict__["monitor_ids"] = monitor_ids
             __props__.__dict__["name"] = name
             if protocol is None and not opts.urn:
@@ -704,7 +633,6 @@ def get(resource_name: str,
             opts: Optional[pulumi.ResourceOptions] = None,
             lb_method: Optional[pulumi.Input[str]] = None,
             lb_provider: Optional[pulumi.Input[str]] = None,
-            members: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             monitor_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             name: Optional[pulumi.Input[str]] = None,
             protocol: Optional[pulumi.Input[str]] = None,
@@ -723,10 +651,6 @@ def get(resource_name: str,
                'LEAST_CONNECTIONS' as valid values for this attribute.
         :param pulumi.Input[str] lb_provider: The backend load balancing provider. For example:
                `haproxy`, `F5`, etc.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] members: An existing node to add to the pool. Changing this
-               updates the members of the pool. The member object structure is documented
-               below. Please note that the `member` block is deprecated in favor of the
-               `loadbalancer.MemberV1` resource.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] monitor_ids: A list of IDs of monitors to associate with the
                pool.
         :param pulumi.Input[str] name: The name of the pool. Changing this updates the name of
@@ -749,7 +673,6 @@ def get(resource_name: str,
 
         __props__.__dict__["lb_method"] = lb_method
         __props__.__dict__["lb_provider"] = lb_provider
-        __props__.__dict__["members"] = members
         __props__.__dict__["monitor_ids"] = monitor_ids
         __props__.__dict__["name"] = name
         __props__.__dict__["protocol"] = protocol
@@ -777,20 +700,6 @@ def lb_provider(self) -> pulumi.Output[str]:
         """
         return pulumi.get(self, "lb_provider")
 
-    @property
-    @pulumi.getter
-    def members(self) -> pulumi.Output[Optional[Sequence[str]]]:
-        """
-        An existing node to add to the pool. Changing this
-        updates the members of the pool. The member object structure is documented
-        below. Please note that the `member` block is deprecated in favor of the
-        `loadbalancer.MemberV1` resource.
-        """
-        warnings.warn("""Use loadbalancer.MemberV1 instead""", DeprecationWarning)
-        pulumi.log.warn("""members is deprecated: Use loadbalancer.MemberV1 instead""")
-
-        return pulumi.get(self, "members")
-
     @property
     @pulumi.getter(name="monitorIds")
     def monitor_ids(self) -> pulumi.Output[Optional[Sequence[str]]]:
diff --git a/sdk/python/pulumi_openstack/loadbalancer/quota.py b/sdk/python/pulumi_openstack/loadbalancer/quota.py
index 6b54bdd03..b18be6df1 100644
--- a/sdk/python/pulumi_openstack/loadbalancer/quota.py
+++ b/sdk/python/pulumi_openstack/loadbalancer/quota.py
@@ -378,8 +378,6 @@ def __init__(__self__,
 
         > **Note:** This usually requires admin privileges.
 
-        > **Note:** This resource is only available for Octavia.
-
         > **Note:** This resource has a no-op deletion so no actual actions will be done against the OpenStack
            API in case of delete call.
 
@@ -450,8 +448,6 @@ def __init__(__self__,
 
         > **Note:** This usually requires admin privileges.
 
-        > **Note:** This resource is only available for Octavia.
-
         > **Note:** This resource has a no-op deletion so no actual actions will be done against the OpenStack
            API in case of delete call.
 
diff --git a/sdk/python/pulumi_openstack/networking/_inputs.py b/sdk/python/pulumi_openstack/networking/_inputs.py
index 77ed980b0..434535747 100644
--- a/sdk/python/pulumi_openstack/networking/_inputs.py
+++ b/sdk/python/pulumi_openstack/networking/_inputs.py
@@ -18,8 +18,6 @@
     'RouterExternalFixedIpArgs',
     'RouterVendorOptionsArgs',
     'SubnetAllocationPoolArgs',
-    'SubnetAllocationPoolsCollectionArgs',
-    'SubnetHostRouteArgs',
     'TrunkSubPortArgs',
 ]
 
@@ -413,80 +411,6 @@ def start(self, value: pulumi.Input[str]):
         pulumi.set(self, "start", value)
 
 
-@pulumi.input_type
-class SubnetAllocationPoolsCollectionArgs:
-    def __init__(__self__, *,
-                 end: pulumi.Input[str],
-                 start: pulumi.Input[str]):
-        """
-        :param pulumi.Input[str] end: The ending address.
-        :param pulumi.Input[str] start: The starting address.
-        """
-        pulumi.set(__self__, "end", end)
-        pulumi.set(__self__, "start", start)
-
-    @property
-    @pulumi.getter
-    def end(self) -> pulumi.Input[str]:
-        """
-        The ending address.
-        """
-        return pulumi.get(self, "end")
-
-    @end.setter
-    def end(self, value: pulumi.Input[str]):
-        pulumi.set(self, "end", value)
-
-    @property
-    @pulumi.getter
-    def start(self) -> pulumi.Input[str]:
-        """
-        The starting address.
-        """
-        return pulumi.get(self, "start")
-
-    @start.setter
-    def start(self, value: pulumi.Input[str]):
-        pulumi.set(self, "start", value)
-
-
-@pulumi.input_type
-class SubnetHostRouteArgs:
-    def __init__(__self__, *,
-                 destination_cidr: pulumi.Input[str],
-                 next_hop: pulumi.Input[str]):
-        """
-        :param pulumi.Input[str] destination_cidr: The destination CIDR.
-        :param pulumi.Input[str] next_hop: The next hop in the route.
-        """
-        pulumi.set(__self__, "destination_cidr", destination_cidr)
-        pulumi.set(__self__, "next_hop", next_hop)
-
-    @property
-    @pulumi.getter(name="destinationCidr")
-    def destination_cidr(self) -> pulumi.Input[str]:
-        """
-        The destination CIDR.
-        """
-        return pulumi.get(self, "destination_cidr")
-
-    @destination_cidr.setter
-    def destination_cidr(self, value: pulumi.Input[str]):
-        pulumi.set(self, "destination_cidr", value)
-
-    @property
-    @pulumi.getter(name="nextHop")
-    def next_hop(self) -> pulumi.Input[str]:
-        """
-        The next hop in the route.
-        """
-        return pulumi.get(self, "next_hop")
-
-    @next_hop.setter
-    def next_hop(self, value: pulumi.Input[str]):
-        pulumi.set(self, "next_hop", value)
-
-
 @pulumi.input_type
 class TrunkSubPortArgs:
     def __init__(__self__, *,
diff --git a/sdk/python/pulumi_openstack/networking/get_floating_ip.py b/sdk/python/pulumi_openstack/networking/get_floating_ip.py
index 7a3efe582..8595a0efb 100644
--- a/sdk/python/pulumi_openstack/networking/get_floating_ip.py
+++ b/sdk/python/pulumi_openstack/networking/get_floating_ip.py
@@ -189,7 +189,7 @@ def get_floating_ip(address: Optional[str] = None,
     :param str address: The IP address of the floating IP.
     :param str description: Human-readable description of the floating IP.
     :param str fixed_ip: The specific IP address of the internal port which should be associated with the floating IP.
-    :param str pool: The name of the pool from which the floating IP belongs to.
+    :param str pool: The ID of the network from which the floating IP belongs to.
     :param str port_id: The ID of the port the floating IP is attached.
     :param str region: The region in which to obtain the V2 Neutron client.
            A Neutron client is needed to retrieve floating IP ids. If omitted, the
@@ -254,7 +254,7 @@ def get_floating_ip_output(address: Optional[pulumi.Input[Optional[str]]] = None
     :param str address: The IP address of the floating IP.
     :param str description: Human-readable description of the floating IP.
     :param str fixed_ip: The specific IP address of the internal port which should be associated with the floating IP.
-    :param str pool: The name of the pool from which the floating IP belongs to.
+    :param str pool: The ID of the network from which the floating IP belongs to.
     :param str port_id: The ID of the port the floating IP is attached.
     :param str region: The region in which to obtain the V2 Neutron client.
            A Neutron client is needed to retrieve floating IP ids. If omitted, the
diff --git a/sdk/python/pulumi_openstack/networking/get_subnet.py b/sdk/python/pulumi_openstack/networking/get_subnet.py
index 66b8377c8..c31dc9969 100644
--- a/sdk/python/pulumi_openstack/networking/get_subnet.py
+++ b/sdk/python/pulumi_openstack/networking/get_subnet.py
@@ -22,7 +22,7 @@ class GetSubnetResult:
     """
     A collection of values returned by getSubnet.
     """
-    def __init__(__self__, all_tags=None, allocation_pools=None, cidr=None, description=None, dhcp_disabled=None, dhcp_enabled=None, dns_nameservers=None, enable_dhcp=None, gateway_ip=None, host_routes=None, id=None, ip_version=None, ipv6_address_mode=None, ipv6_ra_mode=None, name=None, network_id=None, region=None, service_types=None, subnet_id=None, subnetpool_id=None, tags=None, tenant_id=None):
+    def __init__(__self__, all_tags=None, allocation_pools=None, cidr=None, description=None, dhcp_enabled=None, dns_nameservers=None, enable_dhcp=None, gateway_ip=None, host_routes=None, id=None, ip_version=None, ipv6_address_mode=None, ipv6_ra_mode=None, name=None, network_id=None, region=None, service_types=None, subnet_id=None, subnetpool_id=None, tags=None, tenant_id=None):
         if all_tags and not isinstance(all_tags, list):
             raise TypeError("Expected argument 'all_tags' to be a list")
         pulumi.set(__self__, "all_tags", all_tags)
@@ -35,9 +35,6 @@ def __init__(__self__, all_tags=None, allocation_pools=None, cidr=None, descript
         if description and not isinstance(description, str):
             raise TypeError("Expected argument 'description' to be a str")
         pulumi.set(__self__, "description", description)
-        if dhcp_disabled and not isinstance(dhcp_disabled, bool):
-            raise TypeError("Expected argument 'dhcp_disabled' to be a bool")
-        pulumi.set(__self__, "dhcp_disabled", dhcp_disabled)
         if dhcp_enabled and not isinstance(dhcp_enabled, bool):
             raise TypeError("Expected argument 'dhcp_enabled' to be a bool")
         pulumi.set(__self__, "dhcp_enabled", dhcp_enabled)
@@ -116,14 +113,6 @@ def cidr(self) -> str:
     def description(self) -> str:
         return pulumi.get(self, "description")
 
-    @property
-    @pulumi.getter(name="dhcpDisabled")
-    def dhcp_disabled(self) -> Optional[bool]:
-        warnings.warn("""use dhcp_enabled instead""", DeprecationWarning)
-        pulumi.log.warn("""dhcp_disabled is deprecated: use dhcp_enabled instead""")
-
-        return pulumi.get(self, "dhcp_disabled")
-
     @property
     @pulumi.getter(name="dhcpEnabled")
     def dhcp_enabled(self) -> Optional[bool]:
@@ -238,7 +227,6 @@ def __await__(self):
             allocation_pools=self.allocation_pools,
             cidr=self.cidr,
             description=self.description,
-            dhcp_disabled=self.dhcp_disabled,
             dhcp_enabled=self.dhcp_enabled,
             dns_nameservers=self.dns_nameservers,
             enable_dhcp=self.enable_dhcp,
@@ -260,7 +248,6 @@ def __await__(self):
 
 def get_subnet(cidr: Optional[str] = None,
                description: Optional[str] = None,
-               dhcp_disabled: Optional[bool] = None,
                dhcp_enabled: Optional[bool] = None,
                gateway_ip: Optional[str] = None,
                ip_version: Optional[int] = None,
@@ -309,7 +296,6 @@ def get_subnet(cidr: Optional[str] = None,
     __args__ = dict()
     __args__['cidr'] = cidr
     __args__['description'] = description
-    __args__['dhcpDisabled'] = dhcp_disabled
     __args__['dhcpEnabled'] = dhcp_enabled
     __args__['gatewayIp'] = gateway_ip
     __args__['ipVersion'] = ip_version
@@ -330,7 +316,6 @@ def get_subnet(cidr: Optional[str] = None,
         allocation_pools=pulumi.get(__ret__, 'allocation_pools'),
         cidr=pulumi.get(__ret__, 'cidr'),
         description=pulumi.get(__ret__, 'description'),
-        dhcp_disabled=pulumi.get(__ret__, 'dhcp_disabled'),
         dhcp_enabled=pulumi.get(__ret__, 'dhcp_enabled'),
         dns_nameservers=pulumi.get(__ret__, 'dns_nameservers'),
         enable_dhcp=pulumi.get(__ret__, 'enable_dhcp'),
@@ -353,7 +338,6 @@ def get_subnet(cidr: Optional[str] = None,
 @_utilities.lift_output_func(get_subnet)
 def get_subnet_output(cidr: Optional[pulumi.Input[Optional[str]]] = None,
                       description: Optional[pulumi.Input[Optional[str]]] = None,
-                      dhcp_disabled: Optional[pulumi.Input[Optional[bool]]] = None,
                       dhcp_enabled: Optional[pulumi.Input[Optional[bool]]] = None,
                       gateway_ip: Optional[pulumi.Input[Optional[str]]] = None,
                       ip_version: Optional[pulumi.Input[Optional[int]]] = None,
diff --git a/sdk/python/pulumi_openstack/networking/outputs.py b/sdk/python/pulumi_openstack/networking/outputs.py
index 958e261f5..240c9ee8f 100644
--- a/sdk/python/pulumi_openstack/networking/outputs.py
+++ b/sdk/python/pulumi_openstack/networking/outputs.py
@@ -18,8 +18,6 @@
     'RouterExternalFixedIp',
     'RouterVendorOptions',
     'SubnetAllocationPool',
-    'SubnetAllocationPoolsCollection',
-    'SubnetHostRoute',
     'TrunkSubPort',
     'GetNetworkSegmentResult',
     'GetPortAllowedAddressPairResult',
@@ -476,83 +474,6 @@ def start(self) -> str:
         return pulumi.get(self, "start")
 
 
-@pulumi.output_type
-class SubnetAllocationPoolsCollection(dict):
-    def __init__(__self__, *,
-                 end: str,
-                 start: str):
-        """
-        :param str end: The ending address.
-        :param str start: The starting address.
-        """
-        pulumi.set(__self__, "end", end)
-        pulumi.set(__self__, "start", start)
-
-    @property
-    @pulumi.getter
-    def end(self) -> str:
-        """
-        The ending address.
-        """
-        return pulumi.get(self, "end")
-
-    @property
-    @pulumi.getter
-    def start(self) -> str:
-        """
-        The starting address.
-        """
-        return pulumi.get(self, "start")
-
-
-@pulumi.output_type
-class SubnetHostRoute(dict):
-    @staticmethod
-    def __key_warning(key: str):
-        suggest = None
-        if key == "destinationCidr":
-            suggest = "destination_cidr"
-        elif key == "nextHop":
-            suggest = "next_hop"
-
-        if suggest:
-            pulumi.log.warn(f"Key '{key}' not found in SubnetHostRoute. Access the value via the '{suggest}' property getter instead.")
-
-    def __getitem__(self, key: str) -> Any:
-        SubnetHostRoute.__key_warning(key)
-        return super().__getitem__(key)
-
-    def get(self, key: str, default = None) -> Any:
-        SubnetHostRoute.__key_warning(key)
-        return super().get(key, default)
-
-    def __init__(__self__, *,
-                 destination_cidr: str,
-                 next_hop: str):
-        """
-        :param str destination_cidr: The destination CIDR.
-        :param str next_hop: The next hop in the route.
-        """
-        pulumi.set(__self__, "destination_cidr", destination_cidr)
-        pulumi.set(__self__, "next_hop", next_hop)
-
-    @property
-    @pulumi.getter(name="destinationCidr")
-    def destination_cidr(self) -> str:
-        """
-        The destination CIDR.
-        """
-        return pulumi.get(self, "destination_cidr")
-
-    @property
-    @pulumi.getter(name="nextHop")
-    def next_hop(self) -> str:
-        """
-        The next hop in the route.
-        """
-        return pulumi.get(self, "next_hop")
-
-
 @pulumi.output_type
 class TrunkSubPort(dict):
     @staticmethod
diff --git a/sdk/python/pulumi_openstack/networking/router.py b/sdk/python/pulumi_openstack/networking/router.py
index 1c1d21637..a2eca8629 100644
--- a/sdk/python/pulumi_openstack/networking/router.py
+++ b/sdk/python/pulumi_openstack/networking/router.py
@@ -22,7 +22,6 @@ def __init__(__self__, *,
                  distributed: Optional[pulumi.Input[bool]] = None,
                  enable_snat: Optional[pulumi.Input[bool]] = None,
                  external_fixed_ips: Optional[pulumi.Input[Sequence[pulumi.Input['RouterExternalFixedIpArgs']]]] = None,
-                 external_gateway: Optional[pulumi.Input[str]] = None,
                  external_network_id: Optional[pulumi.Input[str]] = None,
                  external_subnet_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
@@ -53,11 +52,6 @@ def __init__(__self__, *,
                can be repeated. The structure is described below. An `external_network_id`
                has to be set in order to set this property. Changing this updates the
                external fixed IPs of the router.
-        :param pulumi.Input[str] external_gateway: The
-               network UUID of an external gateway for the router. A router with an
-               external gateway is required if any compute instances or load balancers
-               will be using floating IPs. Changing this updates the external gateway
-               of an existing router.
         :param pulumi.Input[str] external_network_id: The network UUID of an external gateway
                for the router. A router with an external gateway is required if any
                compute instances or load balancers will be using floating IPs. Changing
@@ -92,11 +86,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "enable_snat", enable_snat)
         if external_fixed_ips is not None:
             pulumi.set(__self__, "external_fixed_ips", external_fixed_ips)
-        if external_gateway is not None:
-            warnings.warn("""use external_network_id instead""", DeprecationWarning)
-            pulumi.log.warn("""external_gateway is deprecated: use external_network_id instead""")
-        if external_gateway is not None:
-            pulumi.set(__self__, "external_gateway", external_gateway)
         if external_network_id is not None:
             pulumi.set(__self__, "external_network_id", external_network_id)
         if external_subnet_ids is not None:
@@ -200,25 +189,6 @@ def external_fixed_ips(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['Rou
     def external_fixed_ips(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['RouterExternalFixedIpArgs']]]]):
         pulumi.set(self, "external_fixed_ips", value)
 
-    @property
-    @pulumi.getter(name="externalGateway")
-    def external_gateway(self) -> Optional[pulumi.Input[str]]:
-        """
-        The
-        network UUID of an external gateway for the router. A router with an
-        external gateway is required if any compute instances or load balancers
-        will be using floating IPs. Changing this updates the external gateway
-        of an existing router.
-        """
-        warnings.warn("""use external_network_id instead""", DeprecationWarning)
-        pulumi.log.warn("""external_gateway is deprecated: use external_network_id instead""")
-
-        return pulumi.get(self, "external_gateway")
-
-    @external_gateway.setter
-    def external_gateway(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "external_gateway", value)
-
     @property
     @pulumi.getter(name="externalNetworkId")
     def external_network_id(self) -> Optional[pulumi.Input[str]]:
@@ -339,7 +309,6 @@ def __init__(__self__, *,
                  distributed: Optional[pulumi.Input[bool]] = None,
                  enable_snat: Optional[pulumi.Input[bool]] = None,
                  external_fixed_ips: Optional[pulumi.Input[Sequence[pulumi.Input['RouterExternalFixedIpArgs']]]] = None,
-                 external_gateway: Optional[pulumi.Input[str]] = None,
                  external_network_id: Optional[pulumi.Input[str]] = None,
                  external_subnet_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
@@ -372,11 +341,6 @@ def __init__(__self__, *,
                can be repeated. The structure is described below. An `external_network_id`
                has to be set in order to set this property. Changing this updates the
                external fixed IPs of the router.
-        :param pulumi.Input[str] external_gateway: The
-               network UUID of an external gateway for the router. A router with an
-               external gateway is required if any compute instances or load balancers
-               will be using floating IPs. Changing this updates the external gateway
-               of an existing router.
         :param pulumi.Input[str] external_network_id: The network UUID of an external gateway
                for the router. A router with an external gateway is required if any
                compute instances or load balancers will be using floating IPs. Changing
@@ -413,11 +377,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "enable_snat", enable_snat)
         if external_fixed_ips is not None:
             pulumi.set(__self__, "external_fixed_ips", external_fixed_ips)
-        if external_gateway is not None:
-            warnings.warn("""use external_network_id instead""", DeprecationWarning)
-            pulumi.log.warn("""external_gateway is deprecated: use external_network_id instead""")
-        if external_gateway is not None:
-            pulumi.set(__self__, "external_gateway", external_gateway)
         if external_network_id is not None:
             pulumi.set(__self__, "external_network_id", external_network_id)
         if external_subnet_ids is not None:
@@ -534,25 +493,6 @@ def external_fixed_ips(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['Rou
     def external_fixed_ips(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['RouterExternalFixedIpArgs']]]]):
         pulumi.set(self, "external_fixed_ips", value)
 
-    @property
-    @pulumi.getter(name="externalGateway")
-    def external_gateway(self) -> Optional[pulumi.Input[str]]:
-        """
-        The
-        network UUID of an external gateway for the router. A router with an
-        external gateway is required if any compute instances or load balancers
-        will be using floating IPs. Changing this updates the external gateway
-        of an existing router.
-        """
-        warnings.warn("""use external_network_id instead""", DeprecationWarning)
-        pulumi.log.warn("""external_gateway is deprecated: use external_network_id instead""")
-
-        return pulumi.get(self, "external_gateway")
-
-    @external_gateway.setter
-    def external_gateway(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "external_gateway", value)
-
     @property
     @pulumi.getter(name="externalNetworkId")
     def external_network_id(self) -> Optional[pulumi.Input[str]]:
@@ -674,7 +614,6 @@ def __init__(__self__,
                  distributed: Optional[pulumi.Input[bool]] = None,
                  enable_snat: Optional[pulumi.Input[bool]] = None,
                  external_fixed_ips: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['RouterExternalFixedIpArgs']]]]] = None,
-                 external_gateway: Optional[pulumi.Input[str]] = None,
                  external_network_id: Optional[pulumi.Input[str]] = None,
                  external_subnet_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
@@ -729,11 +668,6 @@ def __init__(__self__,
                can be repeated. The structure is described below. An `external_network_id`
                has to be set in order to set this property. Changing this updates the
                external fixed IPs of the router.
-        :param pulumi.Input[str] external_gateway: The
-               network UUID of an external gateway for the router. A router with an
-               external gateway is required if any compute instances or load balancers
-               will be using floating IPs. Changing this updates the external gateway
-               of an existing router.
         :param pulumi.Input[str] external_network_id: The network UUID of an external gateway
                for the router. A router with an external gateway is required if any
                compute instances or load balancers will be using floating IPs. Changing
@@ -806,7 +740,6 @@ def _internal_init(__self__,
                  distributed: Optional[pulumi.Input[bool]] = None,
                  enable_snat: Optional[pulumi.Input[bool]] = None,
                  external_fixed_ips: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['RouterExternalFixedIpArgs']]]]] = None,
-                 external_gateway: Optional[pulumi.Input[str]] = None,
                  external_network_id: Optional[pulumi.Input[str]] = None,
                  external_subnet_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  name: Optional[pulumi.Input[str]] = None,
@@ -830,7 +763,6 @@ def _internal_init(__self__,
             __props__.__dict__["distributed"] = distributed
             __props__.__dict__["enable_snat"] = enable_snat
             __props__.__dict__["external_fixed_ips"] = external_fixed_ips
-            __props__.__dict__["external_gateway"] = external_gateway
             __props__.__dict__["external_network_id"] = external_network_id
             __props__.__dict__["external_subnet_ids"] = external_subnet_ids
             __props__.__dict__["name"] = name
@@ -857,7 +789,6 @@ def get(resource_name: str,
             distributed: Optional[pulumi.Input[bool]] = None,
             enable_snat: Optional[pulumi.Input[bool]] = None,
             external_fixed_ips: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['RouterExternalFixedIpArgs']]]]] = None,
-            external_gateway: Optional[pulumi.Input[str]] = None,
             external_network_id: Optional[pulumi.Input[str]] = None,
             external_subnet_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             name: Optional[pulumi.Input[str]] = None,
@@ -895,11 +826,6 @@ def get(resource_name: str,
                can be repeated. The structure is described below. An `external_network_id`
                has to be set in order to set this property. Changing this updates the
                external fixed IPs of the router.
-        :param pulumi.Input[str] external_gateway: The
-               network UUID of an external gateway for the router. A router with an
-               external gateway is required if any compute instances or load balancers
-               will be using floating IPs. Changing this updates the external gateway
-               of an existing router.
         :param pulumi.Input[str] external_network_id: The network UUID of an external gateway
                for the router. A router with an external gateway is required if any
                compute instances or load balancers will be using floating IPs. Changing
@@ -933,7 +859,6 @@ def get(resource_name: str,
         __props__.__dict__["distributed"] = distributed
         __props__.__dict__["enable_snat"] = enable_snat
         __props__.__dict__["external_fixed_ips"] = external_fixed_ips
-        __props__.__dict__["external_gateway"] = external_gateway
         __props__.__dict__["external_network_id"] = external_network_id
         __props__.__dict__["external_subnet_ids"] = external_subnet_ids
         __props__.__dict__["name"] = name
@@ -1015,21 +940,6 @@ def external_fixed_ips(self) -> pulumi.Output[Sequence['outputs.RouterExternalFi
         """
         return pulumi.get(self, "external_fixed_ips")
 
-    @property
-    @pulumi.getter(name="externalGateway")
-    def external_gateway(self) -> pulumi.Output[str]:
-        """
-        The
-        network UUID of an external gateway for the router. A router with an
-        external gateway is required if any compute instances or load balancers
-        will be using floating IPs. Changing this updates the external gateway
-        of an existing router.
-        """
-        warnings.warn("""use external_network_id instead""", DeprecationWarning)
-        pulumi.log.warn("""external_gateway is deprecated: use external_network_id instead""")
-
-        return pulumi.get(self, "external_gateway")
-
     @property
     @pulumi.getter(name="externalNetworkId")
     def external_network_id(self) -> pulumi.Output[str]:
diff --git a/sdk/python/pulumi_openstack/networking/subnet.py b/sdk/python/pulumi_openstack/networking/subnet.py
index 765895416..24660016f 100644
--- a/sdk/python/pulumi_openstack/networking/subnet.py
+++ b/sdk/python/pulumi_openstack/networking/subnet.py
@@ -18,13 +18,11 @@ class SubnetArgs:
     def __init__(__self__, *,
                  network_id: pulumi.Input[str],
                  allocation_pools: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolArgs']]]] = None,
-                 allocation_pools_collection: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolsCollectionArgs']]]] = None,
                  cidr: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  dns_nameservers: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  enable_dhcp: Optional[pulumi.Input[bool]] = None,
                  gateway_ip: Optional[pulumi.Input[str]] = None,
-                 host_routes: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetHostRouteArgs']]]] = None,
                  ip_version: Optional[pulumi.Input[int]] = None,
                  ipv6_address_mode: Optional[pulumi.Input[str]] = None,
                  ipv6_ra_mode: Optional[pulumi.Input[str]] = None,
@@ -47,9 +45,6 @@ def __init__(__self__, *,
                than one range of IP addresses to use with DHCP. However, each IP range
                must be from the same CIDR that the subnet is part of.
                The `allocation_pool` block is documented below.
-        :param pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolsCollectionArgs']]] allocation_pools_collection: A block declaring the start and end range of the IP addresses available for
-               use with DHCP in this subnet.
-               The `allocation_pools` block is documented below.
         :param pulumi.Input[str] cidr: CIDR representing IP range for this subnet, based on IP
                version. You can omit this option if you are creating a subnet from a
                subnet pool.
@@ -65,11 +60,6 @@ def __init__(__self__, *,
                Leaving this blank and not setting `no_gateway` will cause a default
                gateway of `.1` to be used. Changing this updates the gateway IP of the
                existing subnet.
-        :param pulumi.Input[Sequence[pulumi.Input['SubnetHostRouteArgs']]] host_routes: (**Deprecated** - use `networking.SubnetRoute`
-               instead) An array of routes that should be used by devices
-               with IPs from this subnet (not including local subnet route). The host_route
-               object structure is documented below. Changing this updates the host routes
-               for the existing subnet.
         :param pulumi.Input[int] ip_version: IP version, either 4 (default) or 6. Changing this creates a
                new subnet.
         :param pulumi.Input[str] ipv6_address_mode: The IPv6 address mode. Valid values are
@@ -99,11 +89,6 @@ def __init__(__self__, *,
         pulumi.set(__self__, "network_id", network_id)
         if allocation_pools is not None:
             pulumi.set(__self__, "allocation_pools", allocation_pools)
-        if allocation_pools_collection is not None:
-            warnings.warn("""use allocation_pool instead""", DeprecationWarning)
-            pulumi.log.warn("""allocation_pools_collection is deprecated: use allocation_pool instead""")
-        if allocation_pools_collection is not None:
-            pulumi.set(__self__, "allocation_pools_collection", allocation_pools_collection)
         if cidr is not None:
             pulumi.set(__self__, "cidr", cidr)
         if description is not None:
@@ -114,11 +99,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "enable_dhcp", enable_dhcp)
         if gateway_ip is not None:
             pulumi.set(__self__, "gateway_ip", gateway_ip)
-        if host_routes is not None:
-            warnings.warn("""Use networking.SubnetRoute instead""", DeprecationWarning)
-            pulumi.log.warn("""host_routes is deprecated: Use networking.SubnetRoute instead""")
-        if host_routes is not None:
-            pulumi.set(__self__, "host_routes", host_routes)
         if ip_version is not None:
             pulumi.set(__self__, "ip_version", ip_version)
         if ipv6_address_mode is not None:
@@ -174,23 +154,6 @@ def allocation_pools(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['Subne
     def allocation_pools(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolArgs']]]]):
         pulumi.set(self, "allocation_pools", value)
 
-    @property
-    @pulumi.getter(name="allocationPoolsCollection")
-    def allocation_pools_collection(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolsCollectionArgs']]]]:
-        """
-        A block declaring the start and end range of the IP addresses available for
-        use with DHCP in this subnet.
-        The `allocation_pools` block is documented below.
-        """
-        warnings.warn("""use allocation_pool instead""", DeprecationWarning)
-        pulumi.log.warn("""allocation_pools_collection is deprecated: use allocation_pool instead""")
-
-        return pulumi.get(self, "allocation_pools_collection")
-
-    @allocation_pools_collection.setter
-    def allocation_pools_collection(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolsCollectionArgs']]]]):
-        pulumi.set(self, "allocation_pools_collection", value)
-
     @property
     @pulumi.getter
     def cidr(self) -> Optional[pulumi.Input[str]]:
@@ -261,25 +224,6 @@ def gateway_ip(self) -> Optional[pulumi.Input[str]]:
     def gateway_ip(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "gateway_ip", value)
 
-    @property
-    @pulumi.getter(name="hostRoutes")
-    def host_routes(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['SubnetHostRouteArgs']]]]:
-        """
-        (**Deprecated** - use `networking.SubnetRoute`
-        instead) An array of routes that should be used by devices
-        with IPs from this subnet (not including local subnet route). The host_route
-        object structure is documented below. Changing this updates the host routes
-        for the existing subnet.
-        """
-        warnings.warn("""Use networking.SubnetRoute instead""", DeprecationWarning)
-        pulumi.log.warn("""host_routes is deprecated: Use networking.SubnetRoute instead""")
-
-        return pulumi.get(self, "host_routes")
-
-    @host_routes.setter
-    def host_routes(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetHostRouteArgs']]]]):
-        pulumi.set(self, "host_routes", value)
-
     @property
     @pulumi.getter(name="ipVersion")
     def ip_version(self) -> Optional[pulumi.Input[int]]:
@@ -443,13 +387,11 @@ class _SubnetState:
     def __init__(__self__, *,
                  all_tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  allocation_pools: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolArgs']]]] = None,
-                 allocation_pools_collection: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolsCollectionArgs']]]] = None,
                  cidr: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  dns_nameservers: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  enable_dhcp: Optional[pulumi.Input[bool]] = None,
                  gateway_ip: Optional[pulumi.Input[str]] = None,
-                 host_routes: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetHostRouteArgs']]]] = None,
                  ip_version: Optional[pulumi.Input[int]] = None,
                  ipv6_address_mode: Optional[pulumi.Input[str]] = None,
                  ipv6_ra_mode: Optional[pulumi.Input[str]] = None,
@@ -473,9 +415,6 @@ def __init__(__self__, *,
                than one range of IP addresses to use with DHCP. However, each IP range
                must be from the same CIDR that the subnet is part of.
                The `allocation_pool` block is documented below.
-        :param pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolsCollectionArgs']]] allocation_pools_collection: A block declaring the start and end range of the IP addresses available for
-               use with DHCP in this subnet.
-               The `allocation_pools` block is documented below.
         :param pulumi.Input[str] cidr: CIDR representing IP range for this subnet, based on IP
                version. You can omit this option if you are creating a subnet from a
                subnet pool.
@@ -491,11 +430,6 @@ def __init__(__self__, *,
                Leaving this blank and not setting `no_gateway` will cause a default
                gateway of `.1` to be used. Changing this updates the gateway IP of the
                existing subnet.
-        :param pulumi.Input[Sequence[pulumi.Input['SubnetHostRouteArgs']]] host_routes: (**Deprecated** - use `networking.SubnetRoute`
-               instead) An array of routes that should be used by devices
-               with IPs from this subnet (not including local subnet route). The host_route
-               object structure is documented below. Changing this updates the host routes
-               for the existing subnet.
         :param pulumi.Input[int] ip_version: IP version, either 4 (default) or 6. Changing this creates a
                new subnet.
         :param pulumi.Input[str] ipv6_address_mode: The IPv6 address mode. Valid values are
@@ -528,11 +462,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "all_tags", all_tags)
         if allocation_pools is not None:
             pulumi.set(__self__, "allocation_pools", allocation_pools)
-        if allocation_pools_collection is not None:
-            warnings.warn("""use allocation_pool instead""", DeprecationWarning)
-            pulumi.log.warn("""allocation_pools_collection is deprecated: use allocation_pool instead""")
-        if allocation_pools_collection is not None:
-            pulumi.set(__self__, "allocation_pools_collection", allocation_pools_collection)
         if cidr is not None:
             pulumi.set(__self__, "cidr", cidr)
         if description is not None:
@@ -543,11 +472,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "enable_dhcp", enable_dhcp)
         if gateway_ip is not None:
             pulumi.set(__self__, "gateway_ip", gateway_ip)
-        if host_routes is not None:
-            warnings.warn("""Use networking.SubnetRoute instead""", DeprecationWarning)
-            pulumi.log.warn("""host_routes is deprecated: Use networking.SubnetRoute instead""")
-        if host_routes is not None:
-            pulumi.set(__self__, "host_routes", host_routes)
         if ip_version is not None:
             pulumi.set(__self__, "ip_version", ip_version)
         if ipv6_address_mode is not None:
@@ -605,23 +529,6 @@ def allocation_pools(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['Subne
     def allocation_pools(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolArgs']]]]):
         pulumi.set(self, "allocation_pools", value)
 
-    @property
-    @pulumi.getter(name="allocationPoolsCollection")
-    def allocation_pools_collection(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolsCollectionArgs']]]]:
-        """
-        A block declaring the start and end range of the IP addresses available for
-        use with DHCP in this subnet.
-        The `allocation_pools` block is documented below.
-        """
-        warnings.warn("""use allocation_pool instead""", DeprecationWarning)
-        pulumi.log.warn("""allocation_pools_collection is deprecated: use allocation_pool instead""")
-
-        return pulumi.get(self, "allocation_pools_collection")
-
-    @allocation_pools_collection.setter
-    def allocation_pools_collection(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetAllocationPoolsCollectionArgs']]]]):
-        pulumi.set(self, "allocation_pools_collection", value)
-
     @property
     @pulumi.getter
     def cidr(self) -> Optional[pulumi.Input[str]]:
@@ -692,25 +599,6 @@ def gateway_ip(self) -> Optional[pulumi.Input[str]]:
     def gateway_ip(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "gateway_ip", value)
 
-    @property
-    @pulumi.getter(name="hostRoutes")
-    def host_routes(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['SubnetHostRouteArgs']]]]:
-        """
-        (**Deprecated** - use `networking.SubnetRoute`
-        instead) An array of routes that should be used by devices
-        with IPs from this subnet (not including local subnet route). The host_route
-        object structure is documented below. Changing this updates the host routes
-        for the existing subnet.
-        """
-        warnings.warn("""Use networking.SubnetRoute instead""", DeprecationWarning)
-        pulumi.log.warn("""host_routes is deprecated: Use networking.SubnetRoute instead""")
-
-        return pulumi.get(self, "host_routes")
-
-    @host_routes.setter
-    def host_routes(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['SubnetHostRouteArgs']]]]):
-        pulumi.set(self, "host_routes", value)
-
     @property
     @pulumi.getter(name="ipVersion")
     def ip_version(self) -> Optional[pulumi.Input[int]]:
@@ -888,13 +776,11 @@ def __init__(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  allocation_pools: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetAllocationPoolArgs']]]]] = None,
-                 allocation_pools_collection: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetAllocationPoolsCollectionArgs']]]]] = None,
                  cidr: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  dns_nameservers: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  enable_dhcp: Optional[pulumi.Input[bool]] = None,
                  gateway_ip: Optional[pulumi.Input[str]] = None,
-                 host_routes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetHostRouteArgs']]]]] = None,
                  ip_version: Optional[pulumi.Input[int]] = None,
                  ipv6_address_mode: Optional[pulumi.Input[str]] = None,
                  ipv6_ra_mode: Optional[pulumi.Input[str]] = None,
@@ -942,9 +828,6 @@ def __init__(__self__,
                than one range of IP addresses to use with DHCP. However, each IP range
                must be from the same CIDR that the subnet is part of.
                The `allocation_pool` block is documented below.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetAllocationPoolsCollectionArgs']]]] allocation_pools_collection: A block declaring the start and end range of the IP addresses available for
-               use with DHCP in this subnet.
-               The `allocation_pools` block is documented below.
         :param pulumi.Input[str] cidr: CIDR representing IP range for this subnet, based on IP
                version. You can omit this option if you are creating a subnet from a
                subnet pool.
@@ -960,11 +843,6 @@ def __init__(__self__,
                Leaving this blank and not setting `no_gateway` will cause a default
                gateway of `.1` to be used. Changing this updates the gateway IP of the
                existing subnet.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetHostRouteArgs']]]] host_routes: (**Deprecated** - use `networking.SubnetRoute`
-               instead) An array of routes that should be used by devices
-               with IPs from this subnet (not including local subnet route). The host_route
-               object structure is documented below. Changing this updates the host routes
-               for the existing subnet.
         :param pulumi.Input[int] ip_version: IP version, either 4 (default) or 6. Changing this creates a
                new subnet.
         :param pulumi.Input[str] ipv6_address_mode: The IPv6 address mode. Valid values are
@@ -1040,13 +918,11 @@ def _internal_init(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  allocation_pools: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetAllocationPoolArgs']]]]] = None,
-                 allocation_pools_collection: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetAllocationPoolsCollectionArgs']]]]] = None,
                  cidr: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  dns_nameservers: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  enable_dhcp: Optional[pulumi.Input[bool]] = None,
                  gateway_ip: Optional[pulumi.Input[str]] = None,
-                 host_routes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetHostRouteArgs']]]]] = None,
                  ip_version: Optional[pulumi.Input[int]] = None,
                  ipv6_address_mode: Optional[pulumi.Input[str]] = None,
                  ipv6_ra_mode: Optional[pulumi.Input[str]] = None,
@@ -1070,13 +946,11 @@ def _internal_init(__self__,
             __props__ = SubnetArgs.__new__(SubnetArgs)
 
             __props__.__dict__["allocation_pools"] = allocation_pools
-            __props__.__dict__["allocation_pools_collection"] = allocation_pools_collection
             __props__.__dict__["cidr"] = cidr
             __props__.__dict__["description"] = description
             __props__.__dict__["dns_nameservers"] = dns_nameservers
             __props__.__dict__["enable_dhcp"] = enable_dhcp
             __props__.__dict__["gateway_ip"] = gateway_ip
-            __props__.__dict__["host_routes"] = host_routes
             __props__.__dict__["ip_version"] = ip_version
             __props__.__dict__["ipv6_address_mode"] = ipv6_address_mode
             __props__.__dict__["ipv6_ra_mode"] = ipv6_ra_mode
@@ -1105,13 +979,11 @@ def get(resource_name: str,
             opts: Optional[pulumi.ResourceOptions] = None,
             all_tags: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             allocation_pools: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetAllocationPoolArgs']]]]] = None,
-            allocation_pools_collection: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetAllocationPoolsCollectionArgs']]]]] = None,
             cidr: Optional[pulumi.Input[str]] = None,
             description: Optional[pulumi.Input[str]] = None,
             dns_nameservers: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             enable_dhcp: Optional[pulumi.Input[bool]] = None,
             gateway_ip: Optional[pulumi.Input[str]] = None,
-            host_routes: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetHostRouteArgs']]]]] = None,
             ip_version: Optional[pulumi.Input[int]] = None,
             ipv6_address_mode: Optional[pulumi.Input[str]] = None,
             ipv6_ra_mode: Optional[pulumi.Input[str]] = None,
@@ -1140,9 +1012,6 @@ def get(resource_name: str,
                than one range of IP addresses to use with DHCP. However, each IP range
                must be from the same CIDR that the subnet is part of.
                The `allocation_pool` block is documented below.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetAllocationPoolsCollectionArgs']]]] allocation_pools_collection: A block declaring the start and end range of the IP addresses available for
-               use with DHCP in this subnet.
-               The `allocation_pools` block is documented below.
         :param pulumi.Input[str] cidr: CIDR representing IP range for this subnet, based on IP
                version. You can omit this option if you are creating a subnet from a
                subnet pool.
@@ -1158,11 +1027,6 @@ def get(resource_name: str,
                Leaving this blank and not setting `no_gateway` will cause a default
                gateway of `.1` to be used. Changing this updates the gateway IP of the
                existing subnet.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SubnetHostRouteArgs']]]] host_routes: (**Deprecated** - use `networking.SubnetRoute`
-               instead) An array of routes that should be used by devices
-               with IPs from this subnet (not including local subnet route). The host_route
-               object structure is documented below. Changing this updates the host routes
-               for the existing subnet.
         :param pulumi.Input[int] ip_version: IP version, either 4 (default) or 6. Changing this creates a
                new subnet.
         :param pulumi.Input[str] ipv6_address_mode: The IPv6 address mode. Valid values are
@@ -1197,13 +1061,11 @@ def get(resource_name: str,
 
         __props__.__dict__["all_tags"] = all_tags
         __props__.__dict__["allocation_pools"] = allocation_pools
-        __props__.__dict__["allocation_pools_collection"] = allocation_pools_collection
         __props__.__dict__["cidr"] = cidr
         __props__.__dict__["description"] = description
         __props__.__dict__["dns_nameservers"] = dns_nameservers
         __props__.__dict__["enable_dhcp"] = enable_dhcp
         __props__.__dict__["gateway_ip"] = gateway_ip
-        __props__.__dict__["host_routes"] = host_routes
         __props__.__dict__["ip_version"] = ip_version
         __props__.__dict__["ipv6_address_mode"] = ipv6_address_mode
         __props__.__dict__["ipv6_ra_mode"] = ipv6_ra_mode
@@ -1241,19 +1103,6 @@ def allocation_pools(self) -> pulumi.Output[Sequence['outputs.SubnetAllocationPo
         """
         return pulumi.get(self, "allocation_pools")
 
-    @property
-    @pulumi.getter(name="allocationPoolsCollection")
-    def allocation_pools_collection(self) -> pulumi.Output[Sequence['outputs.SubnetAllocationPoolsCollection']]:
-        """
-        A block declaring the start and end range of the IP addresses available for
-        use with DHCP in this subnet.
-        The `allocation_pools` block is documented below.
-        """
-        warnings.warn("""use allocation_pool instead""", DeprecationWarning)
-        pulumi.log.warn("""allocation_pools_collection is deprecated: use allocation_pool instead""")
-
-        return pulumi.get(self, "allocation_pools_collection")
-
     @property
     @pulumi.getter
     def cidr(self) -> pulumi.Output[str]:
@@ -1304,21 +1153,6 @@ def gateway_ip(self) -> pulumi.Output[str]:
         """
         return pulumi.get(self, "gateway_ip")
 
-    @property
-    @pulumi.getter(name="hostRoutes")
-    def host_routes(self) -> pulumi.Output[Optional[Sequence['outputs.SubnetHostRoute']]]:
-        """
-        (**Deprecated** - use `networking.SubnetRoute`
-        instead) An array of routes that should be used by devices
-        with IPs from this subnet (not including local subnet route). The host_route
-        object structure is documented below. Changing this updates the host routes
-        for the existing subnet.
-        """
-        warnings.warn("""Use networking.SubnetRoute instead""", DeprecationWarning)
-        pulumi.log.warn("""host_routes is deprecated: Use networking.SubnetRoute instead""")
-
-        return pulumi.get(self, "host_routes")
-
     @property
     @pulumi.getter(name="ipVersion")
     def ip_version(self) -> pulumi.Output[Optional[int]]:
diff --git a/sdk/python/pulumi_openstack/provider.py b/sdk/python/pulumi_openstack/provider.py
index 582458418..bbb515f31 100644
--- a/sdk/python/pulumi_openstack/provider.py
+++ b/sdk/python/pulumi_openstack/provider.py
@@ -42,7 +42,6 @@ def __init__(__self__, *,
                  tenant_id: Optional[pulumi.Input[str]] = None,
                  tenant_name: Optional[pulumi.Input[str]] = None,
                  token: Optional[pulumi.Input[str]] = None,
-                 use_octavia: Optional[pulumi.Input[bool]] = None,
                  user_domain_id: Optional[pulumi.Input[str]] = None,
                  user_domain_name: Optional[pulumi.Input[str]] = None,
                  user_id: Optional[pulumi.Input[str]] = None,
@@ -78,7 +77,6 @@ def __init__(__self__, *,
         :param pulumi.Input[str] tenant_id: The ID of the Tenant (Identity v2) or Project (Identity v3) to login with.
         :param pulumi.Input[str] tenant_name: The name of the Tenant (Identity v2) or Project (Identity v3) to login with.
         :param pulumi.Input[str] token: Authentication token to use as an alternative to username/password.
-        :param pulumi.Input[bool] use_octavia: If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron).
         :param pulumi.Input[str] user_domain_id: The ID of the domain where the user resides (Identity v3).
         :param pulumi.Input[str] user_domain_name: The name of the domain where the user resides (Identity v3).
         :param pulumi.Input[str] user_id: User ID to login with.
@@ -154,13 +152,6 @@ def __init__(__self__, *,
             pulumi.set(__self__, "tenant_name", tenant_name)
         if token is not None:
             pulumi.set(__self__, "token", token)
-        if use_octavia is not None:
-            warnings.warn("""Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia.""", DeprecationWarning)
-            pulumi.log.warn("""use_octavia is deprecated: Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia.""")
-        if use_octavia is None:
-            use_octavia = _utilities.get_env_bool('OS_USE_OCTAVIA')
-        if use_octavia is not None:
-            pulumi.set(__self__, "use_octavia", use_octavia)
         if user_domain_id is not None:
             pulumi.set(__self__, "user_domain_id", user_domain_id)
         if user_domain_name is not None:
@@ -505,21 +496,6 @@ def token(self) -> Optional[pulumi.Input[str]]:
     def token(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "token", value)
 
-    @property
-    @pulumi.getter(name="useOctavia")
-    def use_octavia(self) -> Optional[pulumi.Input[bool]]:
-        """
-        If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron).
-        """
-        warnings.warn("""Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia.""", DeprecationWarning)
-        pulumi.log.warn("""use_octavia is deprecated: Users not using loadbalancer resources can ignore this message. Support for neutron-lbaas will be removed on next major release. Octavia will be the only supported method for loadbalancer resources. Users using octavia will have to remove 'use_octavia' option from the provider configuration block. Users using neutron-lbaas will have to migrate/upgrade to octavia.""")
-
-        return pulumi.get(self, "use_octavia")
-
-    @use_octavia.setter
-    def use_octavia(self, value: Optional[pulumi.Input[bool]]):
-        pulumi.set(self, "use_octavia", value)
-
     @property
     @pulumi.getter(name="userDomainId")
     def user_domain_id(self) -> Optional[pulumi.Input[str]]:
@@ -602,7 +578,6 @@ def __init__(__self__,
                  tenant_id: Optional[pulumi.Input[str]] = None,
                  tenant_name: Optional[pulumi.Input[str]] = None,
                  token: Optional[pulumi.Input[str]] = None,
-                 use_octavia: Optional[pulumi.Input[bool]] = None,
                  user_domain_id: Optional[pulumi.Input[str]] = None,
                  user_domain_name: Optional[pulumi.Input[str]] = None,
                  user_id: Optional[pulumi.Input[str]] = None,
@@ -645,7 +620,6 @@ def __init__(__self__,
         :param pulumi.Input[str] tenant_id: The ID of the Tenant (Identity v2) or Project (Identity v3) to login with.
         :param pulumi.Input[str] tenant_name: The name of the Tenant (Identity v2) or Project (Identity v3) to login with.
         :param pulumi.Input[str] token: Authentication token to use as an alternative to username/password.
-        :param pulumi.Input[bool] use_octavia: If set to `true`, API requests will go the Load Balancer service (Octavia) instead of the Networking service (Neutron).
         :param pulumi.Input[str] user_domain_id: The ID of the domain where the user resides (Identity v3).
         :param pulumi.Input[str] user_domain_name: The name of the domain where the user resides (Identity v3).
         :param pulumi.Input[str] user_id: User ID to login with.
@@ -706,7 +680,6 @@ def _internal_init(__self__,
                  tenant_id: Optional[pulumi.Input[str]] = None,
                  tenant_name: Optional[pulumi.Input[str]] = None,
                  token: Optional[pulumi.Input[str]] = None,
-                 use_octavia: Optional[pulumi.Input[bool]] = None,
                  user_domain_id: Optional[pulumi.Input[str]] = None,
                  user_domain_name: Optional[pulumi.Input[str]] = None,
                  user_id: Optional[pulumi.Input[str]] = None,
@@ -762,9 +735,6 @@ def _internal_init(__self__,
             __props__.__dict__["tenant_id"] = tenant_id
             __props__.__dict__["tenant_name"] = tenant_name
             __props__.__dict__["token"] = token
-            if use_octavia is None:
-                use_octavia = _utilities.get_env_bool('OS_USE_OCTAVIA')
-            __props__.__dict__["use_octavia"] = pulumi.Output.from_input(use_octavia).apply(pulumi.runtime.to_json) if use_octavia is not None else None
             __props__.__dict__["user_domain_id"] = user_domain_id
             __props__.__dict__["user_domain_name"] = user_domain_name
             __props__.__dict__["user_id"] = user_id
diff --git a/sdk/python/pulumi_openstack/pulumi-plugin.json b/sdk/python/pulumi_openstack/pulumi-plugin.json
index c2fd7376d..84f878f23 100644
--- a/sdk/python/pulumi_openstack/pulumi-plugin.json
+++ b/sdk/python/pulumi_openstack/pulumi-plugin.json
@@ -1,5 +1,5 @@
 {
   "resource": true,
   "name": "openstack",
-  "version": "3.0.0-alpha.0+dev"
+  "version": "4.0.0-alpha.0+dev"
 }
diff --git a/sdk/python/pulumi_openstack/vpnaas/ike_policy.py b/sdk/python/pulumi_openstack/vpnaas/ike_policy.py
index b8ce55ca3..e6387ca2a 100644
--- a/sdk/python/pulumi_openstack/vpnaas/ike_policy.py
+++ b/sdk/python/pulumi_openstack/vpnaas/ike_policy.py
@@ -35,7 +35,7 @@ def __init__(__self__, *,
                Changing this updates the description of the existing policy.
         :param pulumi.Input[str] encryption_algorithm: The encryption algorithm. Valid values are 3des, aes-128, aes-192 and so on.
                The default value is aes-128. Changing this updates the existing policy.
-        :param pulumi.Input[str] ike_version: The IKE mode. A valid value is v1 or v2. Default is v1.
+        :param pulumi.Input[str] ike_version: The IKE version. A valid value is v1 or v2. Default is v1.
                Changing this updates the existing policy.
         :param pulumi.Input[Sequence[pulumi.Input['IkePolicyLifetimeArgs']]] lifetimes: The lifetime of the security association. Consists of Unit and Value.
         :param pulumi.Input[str] name: The name of the policy. Changing this updates the name of
@@ -118,7 +118,7 @@ def encryption_algorithm(self, value: Optional[pulumi.Input[str]]):
     @pulumi.getter(name="ikeVersion")
     def ike_version(self) -> Optional[pulumi.Input[str]]:
         """
-        The IKE mode. A valid value is v1 or v2. Default is v1.
+        The IKE version. A valid value is v1 or v2. Default is v1.
         Changing this updates the existing policy.
         """
         return pulumi.get(self, "ike_version")
@@ -241,7 +241,7 @@ def __init__(__self__, *,
                Changing this updates the description of the existing policy.
         :param pulumi.Input[str] encryption_algorithm: The encryption algorithm. Valid values are 3des, aes-128, aes-192 and so on.
                The default value is aes-128. Changing this updates the existing policy.
-        :param pulumi.Input[str] ike_version: The IKE mode. A valid value is v1 or v2. Default is v1.
+        :param pulumi.Input[str] ike_version: The IKE version. A valid value is v1 or v2. Default is v1.
                Changing this updates the existing policy.
         :param pulumi.Input[Sequence[pulumi.Input['IkePolicyLifetimeArgs']]] lifetimes: The lifetime of the security association. Consists of Unit and Value.
         :param pulumi.Input[str] name: The name of the policy. Changing this updates the name of
@@ -324,7 +324,7 @@ def encryption_algorithm(self, value: Optional[pulumi.Input[str]]):
     @pulumi.getter(name="ikeVersion")
     def ike_version(self) -> Optional[pulumi.Input[str]]:
         """
-        The IKE mode. A valid value is v1 or v2. Default is v1.
+        The IKE version. A valid value is v1 or v2. Default is v1.
         Changing this updates the existing policy.
         """
         return pulumi.get(self, "ike_version")
@@ -470,7 +470,7 @@ def __init__(__self__,
                Changing this updates the description of the existing policy.
         :param pulumi.Input[str] encryption_algorithm: The encryption algorithm. Valid values are 3des, aes-128, aes-192 and so on.
                The default value is aes-128. Changing this updates the existing policy.
-        :param pulumi.Input[str] ike_version: The IKE mode. A valid value is v1 or v2. Default is v1.
+        :param pulumi.Input[str] ike_version: The IKE version. A valid value is v1 or v2. Default is v1.
                Changing this updates the existing policy.
         :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['IkePolicyLifetimeArgs']]]] lifetimes: The lifetime of the security association. Consists of Unit and Value.
         :param pulumi.Input[str] name: The name of the policy. Changing this updates the name of
@@ -593,7 +593,7 @@ def get(resource_name: str,
                Changing this updates the description of the existing policy.
         :param pulumi.Input[str] encryption_algorithm: The encryption algorithm. Valid values are 3des, aes-128, aes-192 and so on.
                The default value is aes-128. Changing this updates the existing policy.
-        :param pulumi.Input[str] ike_version: The IKE mode. A valid value is v1 or v2. Default is v1.
+        :param pulumi.Input[str] ike_version: The IKE version. A valid value is v1 or v2. Default is v1.
                Changing this updates the existing policy.
         :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['IkePolicyLifetimeArgs']]]] lifetimes: The lifetime of the security association. Consists of Unit and Value.
         :param pulumi.Input[str] name: The name of the policy. Changing this updates the name of
@@ -658,7 +658,7 @@ def encryption_algorithm(self) -> pulumi.Output[Optional[str]]:
     @pulumi.getter(name="ikeVersion")
     def ike_version(self) -> pulumi.Output[Optional[str]]:
         """
-        The IKE mode. A valid value is v1 or v2. Default is v1.
+        The IKE version. A valid value is v1 or v2. Default is v1.
         Changing this updates the existing policy.
         """
         return pulumi.get(self, "ike_version")
diff --git a/sdk/python/pyproject.toml b/sdk/python/pyproject.toml
index e49099fc5..fc5b41674 100644
--- a/sdk/python/pyproject.toml
+++ b/sdk/python/pyproject.toml
@@ -5,7 +5,7 @@
   keywords = ["pulumi", "openstack"]
   readme = "README.md"
   requires-python = ">=3.8"
-  version = "3.0.0a0+dev"
+  version = "4.0.0a0+dev"
   [project.license]
     text = "Apache-2.0"
   [project.urls]