Merge pull request #1554 from StackPointCloud/openstack_resource_names

Openstack - Replaced hyphens with underscores in .tf files

modules/openstack/nodes/ignition.tf

@@ -8,7 +8,7 @@ data "ignition_config" "node" {
   files = [
     "${data.ignition_file.kubeconfig.id}",
     "${data.ignition_file.kubelet-env.id}",
-    "${data.ignition_file.max-user-watches.id}",
+    "${data.ignition_file.max_user_watches.id}",
     "${data.ignition_file.resolv_conf.id}",
     "${data.ignition_file.hostname.*.id[count.index]}",
   ]
@@ -107,7 +107,7 @@ EOF
   }
 }
 
-data "ignition_file" "max-user-watches" {
+data "ignition_file" "max_user_watches" {
   filesystem = "root"
   path       = "/etc/sysctl.d/max-user-watches.conf"
   mode       = 0644

platforms/openstack/neutron/main.tf

@@ -180,7 +180,7 @@ module "secgroups" {
   tectonic_experimental = "${var.tectonic_experimental}"
 }
 
-module "flannel-vxlan" {
+module "flannel_vxlan" {
   source = "../../../modules/net/flannel-vxlan"
 
   flannel_image     = "${var.tectonic_container_images["flannel"]}"
@@ -190,7 +190,7 @@ module "flannel-vxlan" {
   bootkube_id = "${module.bootkube.id}"
 }
 
-module "calico-network-policy" {
+module "calico_network_policy" {
   source = "../../../modules/net/calico-network-policy"
 
   kube_apiserver_url = "https://${var.tectonic_cluster_name}-k8s.${var.tectonic_base_domain}:443"

platforms/openstack/neutron/nodes.tf

@@ -117,8 +117,8 @@ resource "null_resource" "tectonic" {
   depends_on = [
     "module.bootkube",
     "module.tectonic",
-    "module.flannel-vxlan",
-    "module.calico-network-policy",
+    "module.flannel_vxlan",
+    "module.calico_network_policy",
     "openstack_compute_instance_v2.master_node",
     "openstack_networking_port_v2.master",
     "openstack_networking_floatingip_v2.master",