From 87ee6b34ce7e1de8f5d6c0be67334398478de8d0 Mon Sep 17 00:00:00 2001 From: Michael Mrowetz Date: Tue, 10 Jan 2017 14:13:56 +0900 Subject: [PATCH 1/2] pass openstack-heat OS_USER_DOMAIN_NAME config to domain-name in openstack.conf --- .../kubernetes-heat/fragments/configure-salt.yaml | 1 + cluster/openstack-heat/kubernetes-heat/kubecluster.yaml | 6 ++++++ cluster/openstack-heat/kubernetes-heat/kubeminion.yaml | 5 +++++ cluster/openstack-heat/util.sh | 1 + 4 files changed, 13 insertions(+) diff --git a/cluster/openstack-heat/kubernetes-heat/fragments/configure-salt.yaml b/cluster/openstack-heat/kubernetes-heat/fragments/configure-salt.yaml index 9f8b915af4c..ec2d4a9c6eb 100644 --- a/cluster/openstack-heat/kubernetes-heat/fragments/configure-salt.yaml +++ b/cluster/openstack-heat/kubernetes-heat/fragments/configure-salt.yaml @@ -34,6 +34,7 @@ write_files: password=$OS_PASSWORD region=$OS_REGION_NAME tenant-name=$OS_TENANT_NAME + domain-name=$OS_USER_DOMAIN_NAME [LoadBalancer] lb-version=$LBAAS_VERSION subnet-id=$SUBNET_ID diff --git a/cluster/openstack-heat/kubernetes-heat/kubecluster.yaml b/cluster/openstack-heat/kubernetes-heat/kubecluster.yaml index 0924e03ce04..984a1799fad 100644 --- a/cluster/openstack-heat/kubernetes-heat/kubecluster.yaml +++ b/cluster/openstack-heat/kubernetes-heat/kubecluster.yaml @@ -128,6 +128,10 @@ parameters: description: OpenStack Tenant Name default: false + os_user_domain_name: + type: string + description: OpenStack User Domain Name (Domain-level authorization scope for keystone v3) + enable_proxy: type: string description: Whether or not to enable proxy settings @@ -314,6 +318,7 @@ resources: "$OS_PASSWORD": {get_param: os_password} "$OS_REGION_NAME": {get_param: os_region_name} "$OS_TENANT_NAME": {get_param: os_tenant_name} + "$OS_USER_DOMAIN_NAME": {get_param: os_user_domain_name} "$LBAAS_VERSION": {get_param: lbaas_version} "$SUBNET_ID": {get_resource: fixed_subnet} "$FLOATING_NETWORK_ID": {get_attr: [kube_master_floating, floating_network_id]} @@ -423,6 +428,7 @@ resources: os_password: {get_param: os_password} os_region_name: {get_param: os_region_name} os_tenant_name: {get_param: os_tenant_name} + os_user_domain_name: {get_param: os_user_domain_name} enable_proxy: {get_param: enable_proxy } ftp_proxy: {get_param: ftp_proxy } http_proxy: {get_param: http_proxy } diff --git a/cluster/openstack-heat/kubernetes-heat/kubeminion.yaml b/cluster/openstack-heat/kubernetes-heat/kubeminion.yaml index 0d4f0712db8..09228d41811 100644 --- a/cluster/openstack-heat/kubernetes-heat/kubeminion.yaml +++ b/cluster/openstack-heat/kubernetes-heat/kubeminion.yaml @@ -66,6 +66,10 @@ parameters: description: OpenStack Tenant Name default: false + os_user_domain_name: + type: string + description: OpenStack User Domain Name (Domain-level authorization scope for keystone v3) + enable_proxy: type: string description: Whether or not to enable proxy settings @@ -217,6 +221,7 @@ resources: "$OS_PASSWORD": {get_param: os_password} "$OS_REGION_NAME": {get_param: os_region_name} "$OS_TENANT_NAME": {get_param: os_tenant_name} + "$OS_USER_DOMAIN_NAME": {get_param: os_user_domain_name} "$role": "kubernetes-pool" "$cluster_cidr": {get_param: cluster_cidr} diff --git a/cluster/openstack-heat/util.sh b/cluster/openstack-heat/util.sh index 53781a880af..0648ac54fa1 100644 --- a/cluster/openstack-heat/util.sh +++ b/cluster/openstack-heat/util.sh @@ -224,6 +224,7 @@ function run-heat-script() { --parameter os_password=${OS_PASSWORD} \ --parameter os_region_name=${OS_REGION_NAME} \ --parameter os_tenant_name=${OS_TENANT_NAME} \ + --parameter os_user_domain_name=${OS_USER_DOMAIN_NAME} \ --parameter enable_proxy=${ENABLE_PROXY} \ --parameter ftp_proxy="${FTP_PROXY}" \ --parameter http_proxy="${HTTP_PROXY}" \ From 5bdae77e0cbde7ec3ccea039af3cb5db2eaabf3e Mon Sep 17 00:00:00 2001 From: Michael Mrowetz Date: Wed, 25 Jan 2017 10:46:47 +0900 Subject: [PATCH 2/2] add default for OS_USER_DOMAIN_NAME --- cluster/openstack-heat/openrc-default.sh | 1 + cluster/openstack-heat/openrc-swift.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/cluster/openstack-heat/openrc-default.sh b/cluster/openstack-heat/openrc-default.sh index 214b975675a..8f1dea1a9e1 100644 --- a/cluster/openstack-heat/openrc-default.sh +++ b/cluster/openstack-heat/openrc-default.sh @@ -22,4 +22,5 @@ export OS_USERNAME=${OS_USERNAME:-admin} export OS_PASSWORD=${OS_PASSWORD:-secretsecret} export OS_AUTH_URL=${OS_AUTH_URL:-http://192.168.123.100:5000/v2.0} export OS_TENANT_NAME=${OS_TENANT_NAME:-admin} +export OS_USER_DOMAIN_NAME=${OS_USER_DOMAIN_NAME:-} export OS_REGION_NAME=${OS_REGION_NAME:-RegionOne} diff --git a/cluster/openstack-heat/openrc-swift.sh b/cluster/openstack-heat/openrc-swift.sh index fdb2c5ac3c9..4da9863c514 100644 --- a/cluster/openstack-heat/openrc-swift.sh +++ b/cluster/openstack-heat/openrc-swift.sh @@ -23,4 +23,5 @@ export OS_USERNAME=${OS_USERNAME:-admin} export OS_PASSWORD=${OS_PASSWORD:-secretsecret} export OS_AUTH_URL=${OS_AUTH_URL:-http://192.168.123.100:5000/v2.0} export OS_TENANT_NAME=${OS_TENANT_NAME:-admin} +export OS_USER_DOMAIN_NAME=${OS_USER_DOMAIN_NAME:-} export OS_REGION_NAME=${OS_REGION_NAME:-RegionOne}