diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-14 13:30:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-14 13:30:46 +0000 |
| commit | 1cd8aab94c187d4330f47bc43d8e210e954888db (patch) | |
| tree | 298d6b934e4453801b37462f72c967e127a3d6b5 | |
| parent | 987ae1af770aed397af89d38757ba60a97f3b3d2 (diff) | |
| parent | 3f2a4f2c0684f88ec39748c756552991d8ebf29b (diff) | |
| download | kolla-1cd8aab94c187d4330f47bc43d8e210e954888db.tar.gz kolla-1cd8aab94c187d4330f47bc43d8e210e954888db.zip | |
Merge "Record version on container build"
| -rw-r--r-- | ansible/group_vars/all.yml | 2 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 2 | ||||
| -rwxr-xr-x | kolla/cmd/build.py | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 431de1dc6..3c5e41e0f 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -114,7 +114,7 @@ magnum_api_port: "9511" #################### # Openstack options #################### -openstack_release: "latest" +openstack_release: "1.0.0" openstack_logging_verbose: "True" openstack_logging_debug: "False" diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index a59508df6..62feb5ddb 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -75,7 +75,7 @@ neutron_external_interface: "eth1" # OpenStack options #################### # This option is used to specify the tag to use when pulling the Docker images -#openstack_release: "latest" +#openstack_release: "1.0.0" # Use these options to set the various log levels across all OpenStack projects #openstack_logging_verbose: "True" diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index 216d9d48b..1944ee978 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -227,6 +227,14 @@ class WorkerThread(Thread): LOG.info('{}:Built'.format(image['name'])) +def get_kolla_version(): + local_conf_path = os.path.join(find_base_dir(), "setup.cfg") + config = six.moves.configparser.RawConfigParser() + config.read(local_conf_path) + version = config.get("metadata", "version") + return version + + def find_os_type(): return platform.linux_distribution() @@ -267,7 +275,7 @@ def merge_args_and_config(settings_from_config_file): defaults = { "namespace": "kollaglue", - "tag": "latest", + "tag": get_kolla_version(), "base": "centos", "base_tag": "latest", "install_type": "binary", |