openstack/kayobe
Code Issues Proposed changes

Merge pull request #94 from markgoddard/add-docker-to-ka-test

Browse Source 
Add docker registry config to kolla-ansible role test
This commit is contained in:
Mark Goddard 2017-12-08 09:24:06 +00:00 committed by GitHub
commit c02524d753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/roles/kolla-ansible/tests/test-extras.yml
View File

@ -26,6 +26,9 @@
kolla_base_distro: "fake-distro" kolla_base_distro: "fake-distro"
kolla_install_type: "fake-install-type" kolla_install_type: "fake-install-type"
kolla_docker_namespace: "fake-namespace" kolla_docker_namespace: "fake-namespace"
kolla_docker_registry: "fake-registry"
kolla_docker_registry_username: "fake-username"
kolla_docker_registry_password: "fake-password"
kolla_openstack_release: "fake-release" kolla_openstack_release: "fake-release"
kolla_internal_vip_address: "10.0.0.1" kolla_internal_vip_address: "10.0.0.1"
kolla_internal_fqdn: "fake.internal.fqdn" kolla_internal_fqdn: "fake.internal.fqdn"
@ -166,6 +169,9 @@
kolla_external_fqdn: "fake.external.fqdn" kolla_external_fqdn: "fake.external.fqdn"
node_custom_config: "{{ temp_path }}/etc/kolla/config" node_custom_config: "{{ temp_path }}/etc/kolla/config"
docker_namespace: "fake-namespace" docker_namespace: "fake-namespace"
docker_registry: "fake-registry"
docker_registry_username: "fake-username"
docker_registry_password: "fake-password"
network_interface: "eth0" network_interface: "eth0"
kolla_external_vip_interface: "eth1" kolla_external_vip_interface: "eth1"
api_interface: "eth2" api_interface: "eth2"
@ -261,9 +267,6 @@
# Jinja expressions to be evaluated. # Jinja expressions to be evaluated.
globals_yml: "{{ lookup('file', temp_path ~ '/etc/kolla/globals.yml') | from_yaml }}" globals_yml: "{{ lookup('file', temp_path ~ '/etc/kolla/globals.yml') | from_yaml }}"
unexpected_variables: unexpected_variables:
- docker_registry
- docker_registry_username
- docker_registry_password
- enable_glance - enable_glance
- enable_ironic - enable_ironic
- enable_neutron - enable_neutron