diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-15 12:17:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-15 12:17:47 +0000 |
| commit | a4f9f1e215f7dee6b8d616b1f09a9efe21f6f9de (patch) | |
| tree | f3332ded0172ce52c482284816f3ac4c0845d040 | |
| parent | 4bf3b3615221c0610b4c7f21a0138228ebd063d8 (diff) | |
| parent | 0b4ed976346be0320dd2e1aaeb64af170377ec59 (diff) | |
| download | kolla-a4f9f1e215f7dee6b8d616b1f09a9efe21f6f9de.tar.gz kolla-a4f9f1e215f7dee6b8d616b1f09a9efe21f6f9de.zip | |
Merge "Preconfigure Kolla to work out of the box"
| -rw-r--r-- | vagrant/bootstrap.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 81d0aa3af..ca3e75939 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -79,6 +79,16 @@ EOF resize2fs /dev/VolGroup00/LogVol00 } +function configure_kolla { + # Use local docker registry + sed -i -r "s,^[# ]*docker_registry:.+$,docker_registry: \"${REGISTRY}\"," /etc/kolla/globals.yml + sed -i -r "s,^[# ]*docker_namespace:.+$,docker_namespace: \"lokolla\"," /etc/kolla/globals.yml + sed -i -r "s,^[# ]*docker_insecure_registry:.+$,docker_insecure_registry: \"True\"," /etc/kolla/globals.yml + # Set network interfaces + sed -i -r "s,^[# ]*network_interface:.+$,network_interface: \"eth1\"," /etc/kolla/globals.yml + sed -i -r "s,^[# ]*neutron_external_interface:.+$,neutron_external_interface: \"eth2\"," /etc/kolla/globals.yml +} + # Configure the operator node and install some additional packages. function configure_operator { yum install -y git mariadb && yum clean all @@ -94,6 +104,8 @@ function configure_operator { cp -r ~vagrant/kolla/etc/kolla/ /etc/kolla chown -R vagrant: /etc/kolla + configure_kolla + # Make sure Ansible uses scp. cat > ~vagrant/.ansible.cfg <<EOF [defaults] |