diff --git a/Vagrantfile b/Vagrantfile index 15b5803..ff28c42 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -26,6 +26,5 @@ Vagrant.configure(2) do |config| ansible.playbook = 'ansible/playbook.yaml' end config.vm.network 'forwarded_port', guest: 80, host: 8000 - config.vm.network 'forwarded_port', guest: 5000, host: 5000 config.vm.network 'forwarded_port', guest: 15_672, host: 15_672 end diff --git a/bin/faafo b/bin/faafo index 5ef09f0..8caac4a 100644 --- a/bin/faafo +++ b/bin/faafo @@ -168,7 +168,7 @@ CONF.register_cli_opts([client_commands]) client_cli_opts = [ cfg.StrOpt('endpoint-url', - default='http://localhost:5000', + default='http://localhost', help='API connection URL') ] diff --git a/contrib/install.sh b/contrib/install.sh index c143990..96a02cd 100755 --- a/contrib/install.sh +++ b/contrib/install.sh @@ -24,7 +24,7 @@ if [[ -e /etc/os-release ]]; then RUN_API=0 URL_DATABASE='sqlite:////tmp/sqlite.db' URL_MESSAGING='rabbit://guest:guest@localhost:5672/' - URL_API='http://127.0.0.1:5000' + URL_API='http://127.0.0.1' while getopts amdi:r: FLAG; do case $FLAG in i) diff --git a/contrib/test_api.py b/contrib/test_api.py index d49cfba..559ac3d 100755 --- a/contrib/test_api.py +++ b/contrib/test_api.py @@ -15,7 +15,7 @@ import json import requests -url = 'http://127.0.0.1:5000/api/fractal' +url = 'http://127.0.0.1/api/fractal' headers = {'Content-Type': 'application/json'} uuid = '13bf15a8-9f6c-4d59-956f-7d20f7484687' diff --git a/etc/faafo.conf b/etc/faafo.conf index a06da3d..4cf88bb 100644 --- a/etc/faafo.conf +++ b/etc/faafo.conf @@ -8,7 +8,7 @@ #listen_address = 0.0.0.0 # Bind port. (integer value) -#bind_port = 5000 +#bind_port = 80 # Database connection URL. (string value) database_url = sqlite:////tmp/sqlite.db @@ -18,7 +18,7 @@ database_url = sqlite:////tmp/sqlite.db # # API connection URL (string value) -endpoint_url = http://localhost:5000 +endpoint_url = http://localhost # # From oslo.log diff --git a/etc/faafo.conf.sample b/etc/faafo.conf.sample index bc1beac..f8997a2 100644 --- a/etc/faafo.conf.sample +++ b/etc/faafo.conf.sample @@ -8,7 +8,7 @@ #listen_address = 0.0.0.0 # Bind port. (integer value) -#bind_port = 5000 +#bind_port = 80 # Database connection URL. (string value) #database_url = sqlite:////tmp/sqlite.db @@ -18,7 +18,7 @@ # # API connection URL (string value) -#endpoint_url = http://localhost:5000 +#endpoint_url = http://localhost # # From oslo.log diff --git a/faafo/api/service.py b/faafo/api/service.py index f7d8bbf..033e831 100644 --- a/faafo/api/service.py +++ b/faafo/api/service.py @@ -33,7 +33,7 @@ api_opts = [ default='0.0.0.0', help='Listen address.'), cfg.IntOpt('bind-port', - default='5000', + default='80', help='Bind port.'), cfg.StrOpt('database-url', default='sqlite:////tmp/sqlite.db', diff --git a/faafo/worker/service.py b/faafo/worker/service.py index 9e8547d..c9caa57 100644 --- a/faafo/worker/service.py +++ b/faafo/worker/service.py @@ -41,7 +41,7 @@ glance_store.register_opts(CONF) worker_opts = { cfg.StrOpt('endpoint-url', - default='http://localhost:5000', + default='http://localhost', help='API connection URL') }