Skip to content

OpenStack Destroy Cluster Support #391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Nov 16, 2018
Merged

OpenStack Destroy Cluster Support #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f304be4
vendor: gophercloud/gophercloud
Nov 16, 2018
0b6d686
OpenStack Destroy Support
Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions Gopkg.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions cmd/openshift-install/destroy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/openshift/installer/pkg/destroy"
"github.com/openshift/installer/pkg/destroy/bootstrap"
_ "github.com/openshift/installer/pkg/destroy/libvirt"
_ "github.com/openshift/installer/pkg/destroy/openstack"
Copy link
Contributor

@tomassedovic tomassedovic Nov 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see this package anywhere (and my build fails because of that). Is it possible you've left it out in the squash/rebase?

Copy link
Author

@hardys hardys Nov 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tomassedovic oops, yes you're right, the new package got lost due to the most recent rebase, I'll re-add it and rebase again now #588 landed, thanks for spotting it!

)

func newDestroyCmd() *cobra.Command {
Expand Down
6 changes: 6 additions & 0 deletions data/data/openstack/topology/private-network.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,23 @@ locals {
resource "openstack_networking_network_v2" "openshift-private" {
name = "openshift"
admin_state_up = "true"
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]
}

resource "openstack_networking_subnet_v2" "masters" {
name = "masters"
cidr = "${local.new_master_cidr_range}"
ip_version = 4
network_id = "${openstack_networking_network_v2.openshift-private.id}"
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]
}

resource "openstack_networking_subnet_v2" "workers" {
name = "worker"
cidr = "${local.new_worker_cidr_range}"
ip_version = 4
network_id = "${openstack_networking_network_v2.openshift-private.id}"
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]
}

resource "openstack_networking_port_v2" "masters" {
Expand All @@ -29,6 +32,7 @@ resource "openstack_networking_port_v2" "masters" {
admin_state_up = "true"
network_id = "${openstack_networking_network_v2.openshift-private.id}"
security_group_ids = ["${openstack_networking_secgroup_v2.master.id}"]
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]

fixed_ip {
"subnet_id" = "${openstack_networking_subnet_v2.masters.id}"
Expand All @@ -41,6 +45,7 @@ resource "openstack_networking_port_v2" "bootstrap_port" {
admin_state_up = "true"
network_id = "${openstack_networking_network_v2.openshift-private.id}"
security_group_ids = ["${openstack_networking_secgroup_v2.master.id}"]
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]

fixed_ip {
"subnet_id" = "${openstack_networking_subnet_v2.masters.id}"
Expand All @@ -56,6 +61,7 @@ resource "openstack_networking_router_v2" "openshift-external-router" {
name = "openshift-external-router"
admin_state_up = true
external_network_id = "${data.openstack_networking_network_v2.external_network.id}"
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]
}

resource "openstack_networking_router_interface_v2" "masters_router_interface" {
Expand Down
3 changes: 3 additions & 0 deletions data/data/openstack/topology/sg-lb.tf
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 1 addition & 0 deletions pkg/asset/cluster/openstack/openstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
func Metadata(config *types.InstallConfig) *openstack.Metadata {
return &openstack.Metadata{
Region: config.Platform.OpenStack.Region,
Cloud: config.Platform.OpenStack.Cloud,
Identifier: map[string]string{
"tectonicClusterID": config.ClusterID,
},
Expand Down
2 changes: 2 additions & 0 deletions pkg/destroy/openstack/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Package openstack provides a cluster-destroyer for openstack clusters.
package openstack
Loading