diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-16 22:37:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-16 22:37:27 +0000 |
| commit | c6da765b49ed83b90b4a7ddb599f5912d1738dde (patch) | |
| tree | 295e93cba83c2f47074e2c30868a930e3953a260 /dev | |
| parent | f7c25b213de1cc9ae91c388c5122d22bf0c9348d (diff) | |
| parent | 1cedf77f19ccd0b01791553016fde77748a2ce74 (diff) | |
| download | kolla-c6da765b49ed83b90b4a7ddb599f5912d1738dde.tar.gz kolla-c6da765b49ed83b90b4a7ddb599f5912d1738dde.zip | |
Merge "Use variables to specify http or https when constructing URLs"
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/vagrant/centos-bootstrap.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dev/vagrant/centos-bootstrap.sh b/dev/vagrant/centos-bootstrap.sh index bac332768..83d10c074 100644 --- a/dev/vagrant/centos-bootstrap.sh +++ b/dev/vagrant/centos-bootstrap.sh @@ -19,6 +19,7 @@ else SUPPORT_NODE=support01 fi REGISTRY=operator.local:${REGISTRY_PORT} +ADMIN_PROTOCOL="http" # Install common packages and do some prepwork. function prep_work { @@ -118,7 +119,7 @@ EOF # The openrc file. cat > ~vagrant/openrc <<EOF -export OS_AUTH_URL="http://${SUPPORT_NODE}:35357/v3" +export OS_AUTH_URL="$(ADMIN_PROTOCOL)://${SUPPORT_NODE}:35357/v3" export OS_USERNAME=admin export OS_PASSWORD=password export OS_TENANT_NAME=admin |