Skip to content

Commit

Permalink
Add destroy support for OpenStack security group resources
Browse files Browse the repository at this point in the history
As for ports, this requires changes to the terraform-provider-openstack:

https://github.com/terraform-providers/terraform-provider-openstack/issues/453
  • Loading branch information
Steven Hardy committed Nov 1, 2018
1 parent cebb808 commit 08851bb
Show file tree
Hide file tree
Showing 13 changed files with 739 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions data/data/openstack/topology/sg-lb.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
resource "openstack_networking_secgroup_v2" "mcs" {
name = "mcs"
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]
}

resource "openstack_networking_secgroup_rule_v2" "mcs_https" {
Expand All @@ -14,6 +15,7 @@ resource "openstack_networking_secgroup_rule_v2" "mcs_https" {

resource "openstack_networking_secgroup_v2" "api" {
name = "api"
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]
}

resource "openstack_networking_secgroup_rule_v2" "api_https" {
Expand All @@ -28,6 +30,7 @@ resource "openstack_networking_secgroup_rule_v2" "api_https" {

resource "openstack_networking_secgroup_v2" "console" {
name = "console"
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]
}

resource "openstack_networking_secgroup_rule_v2" "console_http" {
Expand Down
1 change: 1 addition & 0 deletions data/data/openstack/topology/sg-master.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
resource "openstack_networking_secgroup_v2" "master" {
name = "master"
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]
}

resource "openstack_networking_secgroup_rule_v2" "master_mcs" {
Expand Down
1 change: 1 addition & 0 deletions data/data/openstack/topology/sg-worker.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
resource "openstack_networking_secgroup_v2" "worker" {
name = "worker"
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]
}

resource "openstack_networking_secgroup_rule_v2" "worker_ingress_icmp" {
Expand Down
38 changes: 38 additions & 0 deletions pkg/destroy/openstack/openstack_deprovision.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/openshift/installer/pkg/types"

"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
sg "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups"
"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
"github.com/gophercloud/utils/openstack/clientconfig"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -92,6 +93,7 @@ func deleteRunner(deleteFuncName string, dFunction deleteFunc, opts *clientconfi
func populateDeleteFuncs(funcs map[string]deleteFunc) {
funcs["deleteServers"] = deleteServers
funcs["deletePorts"] = deletePorts
funcs["deleteSecurityGroups"] = deleteSecurityGroups
}

// filterObjects will do client-side filtering given an appropriately filled out list of OpenStackObjectWithTags
Expand Down Expand Up @@ -226,6 +228,42 @@ func deletePorts(opts *clientconfig.ClientOpts, filter OpenStackFilter, logger l
return len(allPorts) == 0, nil
}

func deleteSecurityGroups(opts *clientconfig.ClientOpts, filter OpenStackFilter, logger logrus.FieldLogger) (bool, error) {
logger.Debug("Deleting openstack security-groups")
defer logger.Debugf("Exiting deleting openstack security-groups")

conn, err := clientconfig.NewServiceClient("network", opts)
if err != nil {
logger.Fatalf("%v", err)
os.Exit(1)
}
tags := filterTags(filter)
listOpts := sg.ListOpts{
TagsAny: strings.Join(tags, ","),
}

allPages, err := sg.List(conn, listOpts).AllPages()
if err != nil {
logger.Fatalf("%v", err)
os.Exit(1)
}

allGroups, err := sg.ExtractGroups(allPages)
if err != nil {
logger.Fatalf("%v", err)
os.Exit(1)
}
for _, group := range allGroups {
logger.Debugf("Deleting Security Group: %+v", group.ID)
err = sg.Delete(conn, group.ID).ExtractErr()
if err != nil {
// This can fail when sg is still in use by servers
return false, nil
}
}
return len(allGroups) == 0, nil
}

// New returns an OpenStack destroyer from ClusterMetadata.
func New(logger logrus.FieldLogger, metadata *types.ClusterMetadata) (destroy.Destroyer, error) {
return &ClusterUninstaller{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 08851bb

Please sign in to comment.