openstack
/
kolla-kubernetes
Code Issues Proposed changes

Merge "Make sure pathfinder can find passwords.yml in etc/kolla"

This commit is contained in:
Jenkins 2017-05-28 22:26:45 +00:00 committed by Gerrit Code Review
parent 562de46d19 b8d4f1ef36
commit dc9762cf0a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/kolla/globals.yml
View File

@ -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

2
kolla_kubernetes/pathfinder.py
View File

@ -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'))
]

9
tools/test.sh
View File

@ -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