diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml index c6a0049e06..852915f34f 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml +++ b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params-master.yaml @@ -27,7 +27,6 @@ write_files: ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL" USERNAME="$USERNAME" PASSWORD="$PASSWORD" - TENANT_NAME="$TENANT_NAME" CLUSTER_SUBNET="$CLUSTER_SUBNET" TLS_DISABLED="$TLS_DISABLED" KUBE_DASHBOARD_ENABLED="$KUBE_DASHBOARD_ENABLED" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml index 21f1b42645..868afb3d42 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml +++ b/magnum/drivers/common/templates/kubernetes/fragments/write-heat-params.yaml @@ -31,7 +31,6 @@ write_files: PASSWORD="$PASSWORD" VOLUME_DRIVER="$VOLUME_DRIVER" REGION_NAME="$REGION_NAME" - TENANT_NAME="$TENANT_NAME" HTTP_PROXY="$HTTP_PROXY" HTTPS_PROXY="$HTTPS_PROXY" NO_PROXY="$NO_PROXY" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh b/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh index eb3467ff19..6bf7e413fe 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh @@ -5,7 +5,7 @@ KUBE_OS_CLOUD_CONFIG=/etc/kubernetes/kube_openstack_config # Generate a the configuration for Kubernetes services -# to talk to OpenStack Neutron +# to talk to OpenStack Neutron and Cinder cat > $KUBE_OS_CLOUD_CONFIG < - tenant name - loadbalancing_protocol: type: string description: > @@ -496,7 +491,6 @@ resources: etcd_pool_id: {get_attr: [etcd_lb, pool_id]} username: {get_param: username} password: {get_param: password} - tenant_name: {get_param: tenant_name} kubernetes_port: {get_param: kubernetes_port} tls_disabled: {get_param: tls_disabled} kube_dashboard_enabled: {get_param: kube_dashboard_enabled} @@ -557,7 +551,6 @@ resources: magnum_url: {get_param: magnum_url} volume_driver: {get_param: volume_driver} region_name: {get_param: region_name} - tenant_name: {get_param: tenant_name} auth_url: {get_param: auth_url} username: {get_param: username} password: {get_param: password} diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml index 32a911a29f..40fc3c8f42 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml @@ -189,11 +189,6 @@ parameters: description: > user password - tenant_name: - type: string - description: > - tenant name - http_proxy: type: string description: http proxy address for docker @@ -312,7 +307,6 @@ resources: "$AUTH_URL": {get_param: auth_url} "$USERNAME": {get_param: username} "$PASSWORD": {get_param: password} - "$TENANT_NAME": {get_param: tenant_name} "$CLUSTER_SUBNET": {get_param: fixed_subnet} "$TLS_DISABLED": {get_param: tls_disabled} "$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled} diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml index 6093b4da5f..5b96c10e9e 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml @@ -141,10 +141,6 @@ parameters: type: string description: A logically separate section of the cluster - tenant_name: - type: string - description: an alternative term for a project - username: type: string description: > @@ -265,7 +261,6 @@ resources: $PASSWORD: {get_param: password} $VOLUME_DRIVER: {get_param: volume_driver} $REGION_NAME: {get_param: region_name} - $TENANT_NAME: {get_param: tenant_name} $HTTP_PROXY: {get_param: http_proxy} $HTTPS_PROXY: {get_param: https_proxy} $NO_PROXY: {get_param: no_proxy} diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml index 1e938cf1a1..96831905fa 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml @@ -231,11 +231,6 @@ parameters: ChangeMe hidden: true - tenant_name: - type: string - description: > - tenant name - loadbalancing_protocol: type: string description: > @@ -468,7 +463,6 @@ resources: etcd_pool_id: {get_attr: [etcd_lb, pool_id]} username: {get_param: username} password: {get_param: password} - tenant_name: {get_param: tenant_name} kubernetes_port: {get_param: kubernetes_port} tls_disabled: {get_param: tls_disabled} kube_dashboard_enabled: {get_param: kube_dashboard_enabled} @@ -551,7 +545,6 @@ resources: magnum_url: {get_param: magnum_url} volume_driver: {get_param: volume_driver} region_name: {get_param: region_name} - tenant_name: {get_param: tenant_name} auth_url: {get_param: auth_url} username: {get_param: username} password: {get_param: password} diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml index ef89b11c60..d8dff427a7 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml @@ -173,11 +173,6 @@ parameters: description: > user password - tenant_name: - type: string - description: > - tenant name - http_proxy: type: string description: http proxy address for docker @@ -277,7 +272,6 @@ resources: "$AUTH_URL": {get_param: auth_url} "$USERNAME": {get_param: username} "$PASSWORD": {get_param: password} - "$TENANT_NAME": {get_param: tenant_name} "$CLUSTER_SUBNET": {get_param: fixed_subnet} "$TLS_DISABLED": {get_param: tls_disabled} "$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled} diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml index f1955a716c..cf80a33021 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion_software_configs.yaml @@ -96,10 +96,6 @@ parameters: type: string description: A logically separate section of the cluster - tenant_name: - type: string - description: an alternative term for a project - username: type: string description: > @@ -203,7 +199,6 @@ resources: $PASSWORD: {get_param: password} $VOLUME_DRIVER: {get_param: volume_driver} $REGION_NAME: {get_param: region_name} - $TENANT_NAME: {get_param: tenant_name} $HTTP_PROXY: {get_param: http_proxy} $HTTPS_PROXY: {get_param: https_proxy} $NO_PROXY: {get_param: no_proxy} diff --git a/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py index 598f8127b4..3e3574fbe6 100644 --- a/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py +++ b/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py @@ -199,7 +199,6 @@ class TestClusterConductorWithK8s(base.TestCase): 'http_proxy': 'http_proxy', 'https_proxy': 'https_proxy', 'no_proxy': 'no_proxy', - 'tenant_name': 'fake_tenant', 'username': 'fake_user', 'cluster_uuid': self.cluster_dict['uuid'], 'magnum_url': self.mock_osc.magnum_url.return_value, @@ -298,7 +297,6 @@ class TestClusterConductorWithK8s(base.TestCase): 'server_image': 'image_id', 'ssh_key_name': 'keypair_id', 'swift_region': 'RegionOne', - 'tenant_name': 'fake_tenant', 'tls_disabled': False, 'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de', 'trustee_domain_id': self.mock_keystone.trustee_domain_id, @@ -381,7 +379,6 @@ class TestClusterConductorWithK8s(base.TestCase): 'region_name': 'RegionOne', 'registry_enabled': False, 'ssh_key_name': 'keypair_id', - 'tenant_name': 'fake_tenant', 'tls_disabled': False, 'trust_id': '', 'trustee_domain_id': 'trustee_domain_id', @@ -722,7 +719,6 @@ class TestClusterConductorWithK8s(base.TestCase): 'prometheus_monitoring': 'False', 'grafana_admin_passwd': 'fake_pwd', 'kube_dashboard_enabled': 'True', - 'tenant_name': 'fake_tenant', 'username': 'fake_user', 'cluster_uuid': self.cluster_dict['uuid'], 'magnum_url': self.mock_osc.magnum_url.return_value, diff --git a/magnum/tests/unit/drivers/test_template_definition.py b/magnum/tests/unit/drivers/test_template_definition.py index 890474db3c..9196b0574a 100644 --- a/magnum/tests/unit/drivers/test_template_definition.py +++ b/magnum/tests/unit/drivers/test_template_definition.py @@ -248,7 +248,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseTemplateDefinitionTestCase): mock_context.auth_url = 'http://192.168.10.10:5000/v3' mock_context.user_name = 'fake_user' - mock_context.tenant = 'fake_tenant' flannel_cidr = mock_cluster_template.labels.get('flannel_network_cidr') flannel_subnet = mock_cluster_template.labels.get( @@ -291,7 +290,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseTemplateDefinitionTestCase): 'docker_volume_type': docker_volume_type, 'etcd_volume_size': etcd_volume_size, 'username': 'fake_user', - 'tenant_name': 'fake_tenant', 'magnum_url': mock_osc.magnum_url.return_value, 'region_name': mock_osc.cinder_region_name.return_value}} mock_get_params.assert_called_once_with(mock_context, @@ -328,7 +326,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseTemplateDefinitionTestCase): mock_context.auth_url = 'http://192.168.10.10:5000/v3' mock_context.user_name = 'fake_user' - mock_context.tenant = 'fake_tenant' flannel_cidr = mock_cluster_template.labels.get('flannel_network_cidr') flannel_subnet = mock_cluster_template.labels.get( @@ -371,7 +368,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseTemplateDefinitionTestCase): 'docker_volume_type': docker_volume_type, 'etcd_volume_size': etcd_volume_size, 'username': 'fake_user', - 'tenant_name': 'fake_tenant', 'magnum_url': mock_osc.magnum_url.return_value, 'region_name': mock_osc.cinder_region_name.return_value, 'loadbalancing_protocol': 'HTTP',