Remove TENANT_NAME from /etc/sysconfig/heat-params
1. It will fail to create cluster if there is chinese in tenant name 2. TENANT_NAME is unnecessary after changing to trustee this patch is for k8s_fedora_atomic and k8s_fedora_ironic Change-Id: Ie072f183110ae95861fb3694a913a3a4526549fb Close-Bug: #1711308
This commit is contained in:
parent
9eaea84686
commit
048400bd4b
|
@ -27,7 +27,6 @@ write_files:
|
||||||
ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL"
|
ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL"
|
||||||
USERNAME="$USERNAME"
|
USERNAME="$USERNAME"
|
||||||
PASSWORD="$PASSWORD"
|
PASSWORD="$PASSWORD"
|
||||||
TENANT_NAME="$TENANT_NAME"
|
|
||||||
CLUSTER_SUBNET="$CLUSTER_SUBNET"
|
CLUSTER_SUBNET="$CLUSTER_SUBNET"
|
||||||
TLS_DISABLED="$TLS_DISABLED"
|
TLS_DISABLED="$TLS_DISABLED"
|
||||||
KUBE_DASHBOARD_ENABLED="$KUBE_DASHBOARD_ENABLED"
|
KUBE_DASHBOARD_ENABLED="$KUBE_DASHBOARD_ENABLED"
|
||||||
|
|
|
@ -31,7 +31,6 @@ write_files:
|
||||||
PASSWORD="$PASSWORD"
|
PASSWORD="$PASSWORD"
|
||||||
VOLUME_DRIVER="$VOLUME_DRIVER"
|
VOLUME_DRIVER="$VOLUME_DRIVER"
|
||||||
REGION_NAME="$REGION_NAME"
|
REGION_NAME="$REGION_NAME"
|
||||||
TENANT_NAME="$TENANT_NAME"
|
|
||||||
HTTP_PROXY="$HTTP_PROXY"
|
HTTP_PROXY="$HTTP_PROXY"
|
||||||
HTTPS_PROXY="$HTTPS_PROXY"
|
HTTPS_PROXY="$HTTPS_PROXY"
|
||||||
NO_PROXY="$NO_PROXY"
|
NO_PROXY="$NO_PROXY"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
KUBE_OS_CLOUD_CONFIG=/etc/kubernetes/kube_openstack_config
|
KUBE_OS_CLOUD_CONFIG=/etc/kubernetes/kube_openstack_config
|
||||||
|
|
||||||
# Generate a the configuration for Kubernetes services
|
# Generate a the configuration for Kubernetes services
|
||||||
# to talk to OpenStack Neutron
|
# to talk to OpenStack Neutron and Cinder
|
||||||
cat > $KUBE_OS_CLOUD_CONFIG <<EOF
|
cat > $KUBE_OS_CLOUD_CONFIG <<EOF
|
||||||
[Global]
|
[Global]
|
||||||
auth-url=$AUTH_URL
|
auth-url=$AUTH_URL
|
||||||
|
|
|
@ -69,7 +69,6 @@ class K8sFedoraTemplateDefinition(k8s_template_def.K8sTemplateDefinition):
|
||||||
extra_params = kwargs.pop('extra_params', {})
|
extra_params = kwargs.pop('extra_params', {})
|
||||||
|
|
||||||
extra_params['username'] = context.user_name
|
extra_params['username'] = context.user_name
|
||||||
extra_params['tenant_name'] = context.tenant
|
|
||||||
osc = self.get_osc(context)
|
osc = self.get_osc(context)
|
||||||
extra_params['region_name'] = osc.cinder_region_name()
|
extra_params['region_name'] = osc.cinder_region_name()
|
||||||
|
|
||||||
|
|
|
@ -233,11 +233,6 @@ parameters:
|
||||||
ChangeMe
|
ChangeMe
|
||||||
hidden: true
|
hidden: true
|
||||||
|
|
||||||
tenant_name:
|
|
||||||
type: string
|
|
||||||
description: >
|
|
||||||
tenant name
|
|
||||||
|
|
||||||
loadbalancing_protocol:
|
loadbalancing_protocol:
|
||||||
type: string
|
type: string
|
||||||
description: >
|
description: >
|
||||||
|
@ -496,7 +491,6 @@ resources:
|
||||||
etcd_pool_id: {get_attr: [etcd_lb, pool_id]}
|
etcd_pool_id: {get_attr: [etcd_lb, pool_id]}
|
||||||
username: {get_param: username}
|
username: {get_param: username}
|
||||||
password: {get_param: password}
|
password: {get_param: password}
|
||||||
tenant_name: {get_param: tenant_name}
|
|
||||||
kubernetes_port: {get_param: kubernetes_port}
|
kubernetes_port: {get_param: kubernetes_port}
|
||||||
tls_disabled: {get_param: tls_disabled}
|
tls_disabled: {get_param: tls_disabled}
|
||||||
kube_dashboard_enabled: {get_param: kube_dashboard_enabled}
|
kube_dashboard_enabled: {get_param: kube_dashboard_enabled}
|
||||||
|
@ -557,7 +551,6 @@ resources:
|
||||||
magnum_url: {get_param: magnum_url}
|
magnum_url: {get_param: magnum_url}
|
||||||
volume_driver: {get_param: volume_driver}
|
volume_driver: {get_param: volume_driver}
|
||||||
region_name: {get_param: region_name}
|
region_name: {get_param: region_name}
|
||||||
tenant_name: {get_param: tenant_name}
|
|
||||||
auth_url: {get_param: auth_url}
|
auth_url: {get_param: auth_url}
|
||||||
username: {get_param: username}
|
username: {get_param: username}
|
||||||
password: {get_param: password}
|
password: {get_param: password}
|
||||||
|
|
|
@ -189,11 +189,6 @@ parameters:
|
||||||
description: >
|
description: >
|
||||||
user password
|
user password
|
||||||
|
|
||||||
tenant_name:
|
|
||||||
type: string
|
|
||||||
description: >
|
|
||||||
tenant name
|
|
||||||
|
|
||||||
http_proxy:
|
http_proxy:
|
||||||
type: string
|
type: string
|
||||||
description: http proxy address for docker
|
description: http proxy address for docker
|
||||||
|
@ -312,7 +307,6 @@ resources:
|
||||||
"$AUTH_URL": {get_param: auth_url}
|
"$AUTH_URL": {get_param: auth_url}
|
||||||
"$USERNAME": {get_param: username}
|
"$USERNAME": {get_param: username}
|
||||||
"$PASSWORD": {get_param: password}
|
"$PASSWORD": {get_param: password}
|
||||||
"$TENANT_NAME": {get_param: tenant_name}
|
|
||||||
"$CLUSTER_SUBNET": {get_param: fixed_subnet}
|
"$CLUSTER_SUBNET": {get_param: fixed_subnet}
|
||||||
"$TLS_DISABLED": {get_param: tls_disabled}
|
"$TLS_DISABLED": {get_param: tls_disabled}
|
||||||
"$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled}
|
"$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled}
|
||||||
|
|
|
@ -141,10 +141,6 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
description: A logically separate section of the cluster
|
description: A logically separate section of the cluster
|
||||||
|
|
||||||
tenant_name:
|
|
||||||
type: string
|
|
||||||
description: an alternative term for a project
|
|
||||||
|
|
||||||
username:
|
username:
|
||||||
type: string
|
type: string
|
||||||
description: >
|
description: >
|
||||||
|
@ -265,7 +261,6 @@ resources:
|
||||||
$PASSWORD: {get_param: password}
|
$PASSWORD: {get_param: password}
|
||||||
$VOLUME_DRIVER: {get_param: volume_driver}
|
$VOLUME_DRIVER: {get_param: volume_driver}
|
||||||
$REGION_NAME: {get_param: region_name}
|
$REGION_NAME: {get_param: region_name}
|
||||||
$TENANT_NAME: {get_param: tenant_name}
|
|
||||||
$HTTP_PROXY: {get_param: http_proxy}
|
$HTTP_PROXY: {get_param: http_proxy}
|
||||||
$HTTPS_PROXY: {get_param: https_proxy}
|
$HTTPS_PROXY: {get_param: https_proxy}
|
||||||
$NO_PROXY: {get_param: no_proxy}
|
$NO_PROXY: {get_param: no_proxy}
|
||||||
|
|
|
@ -231,11 +231,6 @@ parameters:
|
||||||
ChangeMe
|
ChangeMe
|
||||||
hidden: true
|
hidden: true
|
||||||
|
|
||||||
tenant_name:
|
|
||||||
type: string
|
|
||||||
description: >
|
|
||||||
tenant name
|
|
||||||
|
|
||||||
loadbalancing_protocol:
|
loadbalancing_protocol:
|
||||||
type: string
|
type: string
|
||||||
description: >
|
description: >
|
||||||
|
@ -468,7 +463,6 @@ resources:
|
||||||
etcd_pool_id: {get_attr: [etcd_lb, pool_id]}
|
etcd_pool_id: {get_attr: [etcd_lb, pool_id]}
|
||||||
username: {get_param: username}
|
username: {get_param: username}
|
||||||
password: {get_param: password}
|
password: {get_param: password}
|
||||||
tenant_name: {get_param: tenant_name}
|
|
||||||
kubernetes_port: {get_param: kubernetes_port}
|
kubernetes_port: {get_param: kubernetes_port}
|
||||||
tls_disabled: {get_param: tls_disabled}
|
tls_disabled: {get_param: tls_disabled}
|
||||||
kube_dashboard_enabled: {get_param: kube_dashboard_enabled}
|
kube_dashboard_enabled: {get_param: kube_dashboard_enabled}
|
||||||
|
@ -551,7 +545,6 @@ resources:
|
||||||
magnum_url: {get_param: magnum_url}
|
magnum_url: {get_param: magnum_url}
|
||||||
volume_driver: {get_param: volume_driver}
|
volume_driver: {get_param: volume_driver}
|
||||||
region_name: {get_param: region_name}
|
region_name: {get_param: region_name}
|
||||||
tenant_name: {get_param: tenant_name}
|
|
||||||
auth_url: {get_param: auth_url}
|
auth_url: {get_param: auth_url}
|
||||||
username: {get_param: username}
|
username: {get_param: username}
|
||||||
password: {get_param: password}
|
password: {get_param: password}
|
||||||
|
|
|
@ -173,11 +173,6 @@ parameters:
|
||||||
description: >
|
description: >
|
||||||
user password
|
user password
|
||||||
|
|
||||||
tenant_name:
|
|
||||||
type: string
|
|
||||||
description: >
|
|
||||||
tenant name
|
|
||||||
|
|
||||||
http_proxy:
|
http_proxy:
|
||||||
type: string
|
type: string
|
||||||
description: http proxy address for docker
|
description: http proxy address for docker
|
||||||
|
@ -277,7 +272,6 @@ resources:
|
||||||
"$AUTH_URL": {get_param: auth_url}
|
"$AUTH_URL": {get_param: auth_url}
|
||||||
"$USERNAME": {get_param: username}
|
"$USERNAME": {get_param: username}
|
||||||
"$PASSWORD": {get_param: password}
|
"$PASSWORD": {get_param: password}
|
||||||
"$TENANT_NAME": {get_param: tenant_name}
|
|
||||||
"$CLUSTER_SUBNET": {get_param: fixed_subnet}
|
"$CLUSTER_SUBNET": {get_param: fixed_subnet}
|
||||||
"$TLS_DISABLED": {get_param: tls_disabled}
|
"$TLS_DISABLED": {get_param: tls_disabled}
|
||||||
"$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled}
|
"$KUBE_DASHBOARD_ENABLED": {get_param: kube_dashboard_enabled}
|
||||||
|
|
|
@ -96,10 +96,6 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
description: A logically separate section of the cluster
|
description: A logically separate section of the cluster
|
||||||
|
|
||||||
tenant_name:
|
|
||||||
type: string
|
|
||||||
description: an alternative term for a project
|
|
||||||
|
|
||||||
username:
|
username:
|
||||||
type: string
|
type: string
|
||||||
description: >
|
description: >
|
||||||
|
@ -203,7 +199,6 @@ resources:
|
||||||
$PASSWORD: {get_param: password}
|
$PASSWORD: {get_param: password}
|
||||||
$VOLUME_DRIVER: {get_param: volume_driver}
|
$VOLUME_DRIVER: {get_param: volume_driver}
|
||||||
$REGION_NAME: {get_param: region_name}
|
$REGION_NAME: {get_param: region_name}
|
||||||
$TENANT_NAME: {get_param: tenant_name}
|
|
||||||
$HTTP_PROXY: {get_param: http_proxy}
|
$HTTP_PROXY: {get_param: http_proxy}
|
||||||
$HTTPS_PROXY: {get_param: https_proxy}
|
$HTTPS_PROXY: {get_param: https_proxy}
|
||||||
$NO_PROXY: {get_param: no_proxy}
|
$NO_PROXY: {get_param: no_proxy}
|
||||||
|
|
|
@ -199,7 +199,6 @@ class TestClusterConductorWithK8s(base.TestCase):
|
||||||
'http_proxy': 'http_proxy',
|
'http_proxy': 'http_proxy',
|
||||||
'https_proxy': 'https_proxy',
|
'https_proxy': 'https_proxy',
|
||||||
'no_proxy': 'no_proxy',
|
'no_proxy': 'no_proxy',
|
||||||
'tenant_name': 'fake_tenant',
|
|
||||||
'username': 'fake_user',
|
'username': 'fake_user',
|
||||||
'cluster_uuid': self.cluster_dict['uuid'],
|
'cluster_uuid': self.cluster_dict['uuid'],
|
||||||
'magnum_url': self.mock_osc.magnum_url.return_value,
|
'magnum_url': self.mock_osc.magnum_url.return_value,
|
||||||
|
@ -298,7 +297,6 @@ class TestClusterConductorWithK8s(base.TestCase):
|
||||||
'server_image': 'image_id',
|
'server_image': 'image_id',
|
||||||
'ssh_key_name': 'keypair_id',
|
'ssh_key_name': 'keypair_id',
|
||||||
'swift_region': 'RegionOne',
|
'swift_region': 'RegionOne',
|
||||||
'tenant_name': 'fake_tenant',
|
|
||||||
'tls_disabled': False,
|
'tls_disabled': False,
|
||||||
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de',
|
'trust_id': 'bd11efc5-d4e2-4dac-bbce-25e348ddf7de',
|
||||||
'trustee_domain_id': self.mock_keystone.trustee_domain_id,
|
'trustee_domain_id': self.mock_keystone.trustee_domain_id,
|
||||||
|
@ -381,7 +379,6 @@ class TestClusterConductorWithK8s(base.TestCase):
|
||||||
'region_name': 'RegionOne',
|
'region_name': 'RegionOne',
|
||||||
'registry_enabled': False,
|
'registry_enabled': False,
|
||||||
'ssh_key_name': 'keypair_id',
|
'ssh_key_name': 'keypair_id',
|
||||||
'tenant_name': 'fake_tenant',
|
|
||||||
'tls_disabled': False,
|
'tls_disabled': False,
|
||||||
'trust_id': '',
|
'trust_id': '',
|
||||||
'trustee_domain_id': 'trustee_domain_id',
|
'trustee_domain_id': 'trustee_domain_id',
|
||||||
|
@ -722,7 +719,6 @@ class TestClusterConductorWithK8s(base.TestCase):
|
||||||
'prometheus_monitoring': 'False',
|
'prometheus_monitoring': 'False',
|
||||||
'grafana_admin_passwd': 'fake_pwd',
|
'grafana_admin_passwd': 'fake_pwd',
|
||||||
'kube_dashboard_enabled': 'True',
|
'kube_dashboard_enabled': 'True',
|
||||||
'tenant_name': 'fake_tenant',
|
|
||||||
'username': 'fake_user',
|
'username': 'fake_user',
|
||||||
'cluster_uuid': self.cluster_dict['uuid'],
|
'cluster_uuid': self.cluster_dict['uuid'],
|
||||||
'magnum_url': self.mock_osc.magnum_url.return_value,
|
'magnum_url': self.mock_osc.magnum_url.return_value,
|
||||||
|
|
|
@ -248,7 +248,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseTemplateDefinitionTestCase):
|
||||||
|
|
||||||
mock_context.auth_url = 'http://192.168.10.10:5000/v3'
|
mock_context.auth_url = 'http://192.168.10.10:5000/v3'
|
||||||
mock_context.user_name = 'fake_user'
|
mock_context.user_name = 'fake_user'
|
||||||
mock_context.tenant = 'fake_tenant'
|
|
||||||
|
|
||||||
flannel_cidr = mock_cluster_template.labels.get('flannel_network_cidr')
|
flannel_cidr = mock_cluster_template.labels.get('flannel_network_cidr')
|
||||||
flannel_subnet = mock_cluster_template.labels.get(
|
flannel_subnet = mock_cluster_template.labels.get(
|
||||||
|
@ -291,7 +290,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseTemplateDefinitionTestCase):
|
||||||
'docker_volume_type': docker_volume_type,
|
'docker_volume_type': docker_volume_type,
|
||||||
'etcd_volume_size': etcd_volume_size,
|
'etcd_volume_size': etcd_volume_size,
|
||||||
'username': 'fake_user',
|
'username': 'fake_user',
|
||||||
'tenant_name': 'fake_tenant',
|
|
||||||
'magnum_url': mock_osc.magnum_url.return_value,
|
'magnum_url': mock_osc.magnum_url.return_value,
|
||||||
'region_name': mock_osc.cinder_region_name.return_value}}
|
'region_name': mock_osc.cinder_region_name.return_value}}
|
||||||
mock_get_params.assert_called_once_with(mock_context,
|
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.auth_url = 'http://192.168.10.10:5000/v3'
|
||||||
mock_context.user_name = 'fake_user'
|
mock_context.user_name = 'fake_user'
|
||||||
mock_context.tenant = 'fake_tenant'
|
|
||||||
|
|
||||||
flannel_cidr = mock_cluster_template.labels.get('flannel_network_cidr')
|
flannel_cidr = mock_cluster_template.labels.get('flannel_network_cidr')
|
||||||
flannel_subnet = mock_cluster_template.labels.get(
|
flannel_subnet = mock_cluster_template.labels.get(
|
||||||
|
@ -371,7 +368,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseTemplateDefinitionTestCase):
|
||||||
'docker_volume_type': docker_volume_type,
|
'docker_volume_type': docker_volume_type,
|
||||||
'etcd_volume_size': etcd_volume_size,
|
'etcd_volume_size': etcd_volume_size,
|
||||||
'username': 'fake_user',
|
'username': 'fake_user',
|
||||||
'tenant_name': 'fake_tenant',
|
|
||||||
'magnum_url': mock_osc.magnum_url.return_value,
|
'magnum_url': mock_osc.magnum_url.return_value,
|
||||||
'region_name': mock_osc.cinder_region_name.return_value,
|
'region_name': mock_osc.cinder_region_name.return_value,
|
||||||
'loadbalancing_protocol': 'HTTP',
|
'loadbalancing_protocol': 'HTTP',
|
||||||
|
|
Loading…
Reference in New Issue