From b8d4f1ef366388e1522cf8fb465ee8b23dd3d641 Mon Sep 17 00:00:00 2001 From: Sam Betts Date: Tue, 23 May 2017 15:53:06 +0100 Subject: [PATCH] Make sure pathfinder can find passwords.yml in etc/kolla Change-Id: I9e97950e77424bd0da944ac15e730c98e5c22dea --- etc/kolla/globals.yml | 3 +++ kolla_kubernetes/pathfinder.py | 2 +- tools/test.sh | 9 +++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index dcd969c83..149ae00aa 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -341,3 +341,6 @@ tempest_floating_network_name: # tempest_image_alt_id: "{{ tempest_image_id }}" # tempest_flavor_ref_alt_id: "{{ tempest_flavor_ref_id }}" +api_interface_address: 0.0.0.0 +tunnel_interface_address: 0.0.0.0 +orchestration_engine: KUBERNETES diff --git a/kolla_kubernetes/pathfinder.py b/kolla_kubernetes/pathfinder.py index 9ae537527..fd4b8d41f 100644 --- a/kolla_kubernetes/pathfinder.py +++ b/kolla_kubernetes/pathfinder.py @@ -95,7 +95,7 @@ CONFIG_SEARCH_PATHS = [ '/etc/kolla', '/etc/kolla-kubernetes', os.path.abspath(os.path.join(PathFinder.find_development_root(), - '../kolla/etc/kolla')), + './etc/kolla')), os.path.abspath(os.path.join(PathFinder.find_development_root(), './etc/kolla-kubernetes')) ] diff --git a/tools/test.sh b/tools/test.sh index 14d8961ff..afc0f8ee5 100755 --- a/tools/test.sh +++ b/tools/test.sh @@ -1,10 +1,11 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/" && pwd )" -[ ! -d ../kolla ] && pushd .. && git clone https://github.com/openstack/kolla-ansible && mv kolla-ansible kolla && popd -grep api_interface_address ../kolla/etc/kolla/globals.yml || echo api_interface_address: "0.0.0.0" >> ../kolla/etc/kolla/globals.yml -grep tunnel_interface_address ../kolla/etc/kolla/globals.yml || echo tunnel_interface_address: "0.0.0.0" >> ../kolla/etc/kolla/globals.yml -grep orchestration_engine ../kolla/etc/kolla/globals.yml || echo orchestration_engine: KUBERNETES >> ../kolla/etc/kolla/globals.yml + +grep api_interface_address etc/kolla/globals.yml || echo api_interface_address: "0.0.0.0" >> etc/kolla/globals.yml +grep tunnel_interface_address etc/kolla/globals.yml || echo tunnel_interface_address: "0.0.0.0" >> etc/kolla/globals.yml +grep orchestration_engine etc/kolla/globals.yml || echo orchestration_engine: KUBERNETES >> etc/kolla/globals.yml + #sudo yum install -y golang-bin || sudo apt-get install -y golang #tools/build_helm_templates.sh set -x