x/kolla-mesos
Code Issues Proposed changes

Convert kolla_ansible container to kolla_toolbox

Browse Source 
Change-Id: Ie633c22d46c42fc02eddf86610246e393d4f80f2
Related-Id: I8fd1f49d5a22b36ede5b10f46b9fe02ddda9007e
This commit is contained in:
SamYaple 2016-02-05 15:04:31 +00:00
parent d72a2ee947
commit f5e7d19360
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/all.yml
View File

@ -51,8 +51,8 @@ docker_restart_policy: "always"
docker_restart_policy_retry: "10"
# kolla anisble image name
kolla_ansible_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-ansible"
kolla_ansible_tag: "{{ openstack_release }}"
kolla_toolbox_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-toolbox"
kolla_toolbox_tag: "{{ openstack_release }}"
ansible_task_cmd: "/usr/bin/ansible localhost"
# loglevel for the container init script

2
deployment_files/cinder/cinder-api.chronos.j2
View File

@ -5,7 +5,7 @@
"command": "kolla_start",
"container": {
"type": "DOCKER",
"image": "{{ kolla_ansible_image }}:{{ kolla_ansible_tag }}",
"image": "{{ kolla_toolbox_image }}:{{ kolla_toolbox_tag }}",
"network": "HOST"
},
"environmentVariables": [

2
deployment_files/glance/glance-api.chronos.j2
View File

@ -5,7 +5,7 @@
"command": "kolla_start",
"container": {
"type": "DOCKER",
"image": "{{ kolla_ansible_image }}:{{ kolla_ansible_tag }}",
"image": "{{ kolla_toolbox_image }}:{{ kolla_toolbox_tag }}",
"network": "HOST"
},
"environmentVariables": [

2
deployment_files/keystone/keystone.chronos.j2
View File

@ -5,7 +5,7 @@
"command": "kolla_start",
"container": {
"type": "DOCKER",
"image": "{{ kolla_ansible_image }}:{{ kolla_ansible_tag }}",
"image": "{{ kolla_toolbox_image }}:{{ kolla_toolbox_tag }}",
"network": "HOST"
},
"environmentVariables": [

6
kolla_mesos/config/profiles.py
View File

@ -17,7 +17,7 @@ CONF = cfg.CONF
profiles_opts = [
cfg.ListOpt('infra',
default=['ceph', 'data', 'mariadb', 'haproxy', 'keepalived',
'kolla-ansible', 'memcached', 'mongodb',
'kolla-toolbox', 'memcached', 'mongodb',
'openvswitch', 'rabbitmq', 'rsyslog']),
cfg.ListOpt('main',
default=['cinder', 'ceilometer', 'glance', 'heat', 'horizon',
@ -25,14 +25,14 @@ profiles_opts = [
cfg.ListOpt('aux',
default=['designate', 'gnocchi', 'ironic', 'magnum', 'zaqar']),
cfg.ListOpt('default',
default=['data', 'kolla-ansible', 'glance', 'haproxy', 'heat',
default=['data', 'kolla-toolbox', 'glance', 'haproxy', 'heat',
'horizon', 'keepalived', 'keystone', 'memcached',
'mariadb', 'neutron', 'nova', 'openvswitch',
'rabbitmq', 'rsyslog']),
cfg.ListOpt('gate',
default=['ceph', 'cinder', 'data', 'dind', 'glance', 'haproxy',
'heat', 'horizon', 'keepalived', 'keystone',
'kolla-ansible', 'mariadb', 'memcached', 'neutron',
'kolla-toolbox', 'mariadb', 'memcached', 'neutron',
'nova', 'openvswitch', 'rabbitmq', 'rsyslog'])
]
profiles_opt_group = cfg.OptGroup(name='profiles',

2
kolla_mesos/tests/test_chronos.py
View File

@ -27,7 +27,7 @@ EXAMPLE_CHRONOS_JOB = {
"cpus": 0.3,
"container": {
"type": "DOCKER",
"image": "/--kolla_ansible:",
"image": "/--kolla_toolbox:",
"network": "HOST"
},
"environmentVariables": [