diff --git a/cinder_controller/write_conf.sh b/cinder_controller/write_conf.sh index 2f94221..925d08a 100755 --- a/cinder_controller/write_conf.sh +++ b/cinder_controller/write_conf.sh @@ -15,8 +15,8 @@ enabled_backends = RBD-backend my_ip = $MY_IP [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default diff --git a/cinder_storage/write_conf.sh b/cinder_storage/write_conf.sh index 15b7385..a70f3b7 100755 --- a/cinder_storage/write_conf.sh +++ b/cinder_storage/write_conf.sh @@ -16,8 +16,8 @@ enabled_backends = RBD-backend glance_api_servers = http://$GLANCE_HOST:9292 [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default diff --git a/glance/write_conf.sh b/glance/write_conf.sh index 61f13bf..345f17b 100755 --- a/glance/write_conf.sh +++ b/glance/write_conf.sh @@ -9,8 +9,8 @@ cat << EOF > /etc/glance/glance-api.conf connection = mysql+pymysql://$GLANCE_USER:$GLANCE_PASSWORD@$MYSQL_HOST/glance [image_format] [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default @@ -57,8 +57,8 @@ rbd_store_user = images rbd_store_ceph_conf = /etc/ceph/ceph.conf [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default diff --git a/heat/write_conf.sh b/heat/write_conf.sh index 75f4e93..d70ef40 100755 --- a/heat/write_conf.sh +++ b/heat/write_conf.sh @@ -15,8 +15,8 @@ heat_waitcondition_server_url = http://$HEAT_HOST:8000/v1/waitcondition [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default @@ -27,7 +27,7 @@ password = $HEAT_PASSWORD [trustee] auth_plugin = password -auth_url = http://$KEYSTONE_HOST:35357 +auth_url = https://$KEYSTONE_HOST:35357 username = $HEAT_USER password = $HEAT_PASSWORD user_domain_name = Default diff --git a/neutron_controller/write_conf.sh b/neutron_controller/write_conf.sh index 153ada7..f913fee 100755 --- a/neutron_controller/write_conf.sh +++ b/neutron_controller/write_conf.sh @@ -22,8 +22,8 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf connection = mysql+pymysql://$NEUTRON_USER:$NEUTRON_PASSWORD@mariadb/neutron [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default @@ -33,7 +33,7 @@ username = $NEUTRON_USER password = $NEUTRON_PASSWORD [nova] -auth_url = http://$KEYSTONE_HOST:35357 +auth_url = https://$KEYSTONE_HOST:35357 auth_type = password project_domain_name = Default user_domain_name = Default diff --git a/neutron_controller_ovs/write_conf.sh b/neutron_controller_ovs/write_conf.sh index 153ada7..f913fee 100755 --- a/neutron_controller_ovs/write_conf.sh +++ b/neutron_controller_ovs/write_conf.sh @@ -22,8 +22,8 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf connection = mysql+pymysql://$NEUTRON_USER:$NEUTRON_PASSWORD@mariadb/neutron [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default @@ -33,7 +33,7 @@ username = $NEUTRON_USER password = $NEUTRON_PASSWORD [nova] -auth_url = http://$KEYSTONE_HOST:35357 +auth_url = https://$KEYSTONE_HOST:35357 auth_type = password project_domain_name = Default user_domain_name = Default diff --git a/nova_compute/write_conf.sh b/nova_compute/write_conf.sh index b4ed63c..5d52e4c 100755 --- a/nova_compute/write_conf.sh +++ b/nova_compute/write_conf.sh @@ -41,7 +41,7 @@ security_group_api=neutron [neutron] url = http://$NEUTRON_CONTROLLER_HOST:9696 -auth_url = http://$KEYSTONE_HOST:35357 +auth_url = https://$KEYSTONE_HOST:35357 auth_type = password project_domain_name = Default user_domain_name = Default @@ -66,8 +66,8 @@ lock_path = /var/lib/nova/tmp auth_strategy = keystone [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default @@ -91,7 +91,7 @@ project_domain_name = Default project_name = service auth_type = password user_domain_name = Default -auth_url = http://$KEYSTONE_HOST:35357/v3 +auth_url = https://$KEYSTONE_HOST:35357/v3 username = $NOVA_PLACEMENT_USER password = $NOVA_PLACEMENT_PASSWORD @@ -146,8 +146,8 @@ lock_path = /var/lib/nova/tmp auth_strategy = keystone [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default @@ -171,7 +171,7 @@ project_domain_name = Default project_name = service auth_type = password user_domain_name = Default -auth_url = http://$KEYSTONE_HOST:35357/v3 +auth_url = https://$KEYSTONE_HOST:35357/v3 username = $NOVA_PLACEMENT_USER password = $NOVA_PLACEMENT_PASSWORD @@ -180,7 +180,7 @@ api_paste_config=/etc/nova/api-paste.ini [neutron] url = http://$NEUTRON_CONTROLLER_HOST:9696 -auth_url = http://$KEYSTONE_HOST:35357 +auth_url = https://$KEYSTONE_HOST:35357 auth_type = password project_domain_name = Default user_domain_name = Default @@ -204,8 +204,8 @@ core_plugin = ml2 global_physnet_mtu = $GLOBAL_PHYSNET_MTU [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default @@ -215,7 +215,7 @@ username = $NEUTRON_USER password = $NEUTRON_PASSWORD [nova] -auth_url = http://$KEYSTONE_HOST:35357 +auth_url = https://$KEYSTONE_HOST:35357 auth_type = password project_domain_name = Default user_domain_name = Default diff --git a/nova_service/write_conf.sh b/nova_service/write_conf.sh index ae86a68..6bb1944 100755 --- a/nova_service/write_conf.sh +++ b/nova_service/write_conf.sh @@ -24,7 +24,7 @@ security_group_api=neutron [neutron] url = http://$NEUTRON_CONTROLLER_HOST:9696 -auth_url = http://$KEYSTONE_HOST:35357 +auth_url = https://$KEYSTONE_HOST:35357 auth_type = password project_domain_name = Default user_domain_name = Default @@ -39,8 +39,8 @@ metadata_proxy_shared_secret = $METADATA_SECRET auth_strategy = keystone [keystone_authtoken] -auth_uri = http://$KEYSTONE_HOST:5000 -auth_url = http://$KEYSTONE_HOST:35357 +auth_uri = https://$KEYSTONE_HOST:5000 +auth_url = https://$KEYSTONE_HOST:35357 memcached_servers = $MEMCACHED_HOST:11211 auth_type = password project_domain_name = Default @@ -66,7 +66,7 @@ project_domain_name = Default project_name = service auth_type = password user_domain_name = Default -auth_url = http://$KEYSTONE_HOST:35357/v3 +auth_url = https://$KEYSTONE_HOST:35357/v3 username = $NOVA_PLACEMENT_USER password = $NOVA_PLACEMENT_PASSWORD