From 655cee98f4b97242413945ec51ca28f8ded450e6 Mon Sep 17 00:00:00 2001 From: Przemyslaw Kaminski Date: Wed, 3 Jun 2015 14:02:39 +0200 Subject: [PATCH] Glance: API is now accessible via HAProxy --- example.py | 26 +++++++++++++------ resources/glance_api_service/actions/run.yml | 14 ++++------ .../glance_registry_service/actions/run.yml | 4 +-- .../meta.yaml | 0 4 files changed, 25 insertions(+), 19 deletions(-) rename resources/{haproxy_keystone_config => haproxy_service_config}/meta.yaml (100%) diff --git a/example.py b/example.py index 64ded92a..1f282b84 100644 --- a/example.py +++ b/example.py @@ -42,7 +42,7 @@ def deploy(): keystone_config2 = resource.create('keystone_config2', 'resources/keystone_config/', {'config_dir': '/etc/solar/keystone', 'ip': '', 'ssh_user': '', 'ssh_key': '', 'admin_token': 'admin', 'db_password': '', 'db_name': '', 'db_user': '', 'db_host': '', 'db_port': ''}) keystone_service2 = resource.create('keystone_service2', 'resources/keystone_service/', {'port': 5002, 'admin_port': 35358, 'image': '', 'ip': '', 'ssh_key': '', 'ssh_user': '', 'config_dir': ''}) - haproxy_keystone_config = resource.create('haproxy_keystone1_config', 'resources/haproxy_keystone_config/', {'name': 'keystone_config', 'listen_port':5000, 'servers':[], 'ports':[]}) + haproxy_keystone_config = resource.create('haproxy_keystone1_config', 'resources/haproxy_service_config/', {'name': 'keystone_config', 'listen_port': 5000, 'servers':[], 'ports':[]}) haproxy_config = resource.create('haproxy_config', 'resources/haproxy_config', {'ip': '', 'ssh_key': '', 'ssh_user': '', 'configs_names':[], 'configs_ports':[], 'listen_ports':[], 'configs':[], 'config_dir': ''}) haproxy_service = resource.create('haproxy_service', 'resources/docker_container/', {'image': 'tutum/haproxy', 'ports': [], 'host_binds': [], 'volume_binds':[], 'ip': '', 'ssh_key': '', 'ssh_user': ''}) @@ -55,12 +55,13 @@ def deploy(): glance_keystone_role = resource.create('glance_keystone_role', 'resources/keystone_role', {'keystone_host': '', 'keystone_port': '', 'login_user': 'admin', 'admin_token': '', 'tenant_name': '', 'user_name': '', 'role_name': 'admin', 'ip': '', 'ssh_user': '', 'ssh_key': ''}) glance_config = resource.create('glance_config', 'resources/glance_config/', {'ip': '', 'ssh_key': '', 'ssh_user': '', 'keystone_ip': '', 'keystone_port': '', 'config_dir': {}, 'api_port': '', 'registry_port': '', 'mysql_ip': '', 'mysql_db': '', 'mysql_user': '', 'mysql_password': '', 'keystone_admin_user': '', 'keystone_admin_password': '', 'keystone_admin_port': '', 'keystone_admin_tenant': ''}) - glance_api_container = resource.create('glance_api_container', 'resources/glance_api_service/', {'image': 'cgenie/centos-rdo-glance-api', 'ports': [{'value': [{'value': 9292}]}], 'host_binds': [], 'volume_binds': [], 'db_password': '', 'keystone_password': '', 'keystone_admin_token': '', 'keystone_host': '', 'ip': '', 'ssh_key': '', 'ssh_user': ''}) + glance_api_container = resource.create('glance_api_container', 'resources/glance_api_service/', {'image': 'cgenie/centos-rdo-glance-api', 'ports': [{'value': [{'value': 9393}]}], 'host_binds': [], 'volume_binds': [], 'db_password': '', 'keystone_password': '', 'keystone_admin_token': '', 'keystone_host': '', 'ip': '', 'ssh_key': '', 'ssh_user': ''}) glance_registry_container = resource.create('glance_registry_container', 'resources/glance_registry_service/', {'image': 'cgenie/centos-rdo-glance-registry', 'ports': [{'value': [{'value': 9191}]}], 'host_binds': [], 'volume_binds': [], 'db_host': '', 'db_root_password': '', 'db_password': '', 'db_name': '', 'db_user': '', 'keystone_admin_tenant': '', 'keystone_password': '', 'keystone_user': '', 'keystone_admin_token': '', 'keystone_host': '', 'ip': '', 'ssh_key': '', 'ssh_user': ''}) # TODO: admin_port should be refactored, we need to rethink docker # container resource and make it common for all # resources used in this demo - glance_api_endpoint = resource.create('glance_api_endpoint', 'resources/keystone_service_endpoint/', {'ip': '', 'ssh_key': '', 'ssh_user': '', 'admin_port': 9292, 'admin_token': '', 'adminurl': 'http://{{ip}}:{{admin_port}}', 'internalurl': 'http://{{ip}}:{{port}}', 'publicurl': 'http://{{ip}}:{{port}}', 'description': 'OpenStack Image Service', 'keystone_host': '', 'keystone_port': '', 'name': 'glance', 'port': 9292, 'type': 'image'}) + glance_api_endpoint = resource.create('glance_api_endpoint', 'resources/keystone_service_endpoint/', {'ip': '', 'ssh_key': '', 'ssh_user': '', 'admin_port': '', 'admin_token': '', 'adminurl': 'http://{{ip}}:{{admin_port}}', 'internalurl': 'http://{{ip}}:{{port}}', 'publicurl': 'http://{{ip}}:{{port}}', 'description': 'OpenStack Image Service', 'keystone_host': '', 'keystone_port': '', 'name': 'glance', 'port': '', 'type': 'image'}) + haproxy_glance_api_config = resource.create('haproxy_glance_api_config', 'resources/haproxy_service_config/', {'name': 'glance_api_config', 'listen_port': 9292, 'servers': [], 'ports':[]}) admin_tenant = resource.create('admin_tenant', 'resources/keystone_tenant', {'keystone_host': '', 'keystone_port': '', 'login_user': 'admin', 'admin_token': '', 'tenant_name': 'admin', 'ip': '', 'ssh_user': '', 'ssh_key': ''}) admin_user = resource.create('admin_user', 'resources/keystone_user', {'keystone_host': '', 'keystone_port': '', 'login_user': 'admin', 'admin_token': '', 'tenant_name': '', 'user_name': 'admin', 'user_password': 'admin', 'ip': '', 'ssh_user': '', 'ssh_key': ''}) @@ -75,7 +76,7 @@ def deploy(): # mariadb signals.connect(node1, mariadb_service1) - #rabbitmq + # rabbitmq signals.connect(node1, rabbitmq_service1) signals.connect(rabbitmq_service1, openstack_vhost) signals.connect(rabbitmq_service1, openstack_rabbitmq_user) @@ -164,10 +165,17 @@ def deploy(): signals.connect(glance_keystone_user, glance_registry_container, {'admin_token': 'keystone_admin_token'}) signals.connect(haproxy_config, glance_registry_container, {'ip': 'keystone_host'}) + # glance haproxy + signals.connect(glance_api_container, haproxy_glance_api_config, {'ip': 'servers'}) + signals.connect(glance_config, haproxy_glance_api_config, {'api_port': 'ports'}) + signals.connect(haproxy_glance_api_config, haproxy_config, {'listen_port': 'listen_ports', 'name': 'configs_names', 'ports': 'configs_ports', 'servers': 'configs'}) + # glance keystone endpoint signals.connect(glance_api_container, glance_api_endpoint, {'ip': 'ip', 'ssh_user': 'ssh_user', 'ssh_key': 'ssh_key'}) signals.connect(keystone_config1, glance_api_endpoint, {'admin_token': 'admin_token'}) signals.connect(keystone_service1, glance_api_endpoint, {'ip': 'keystone_host', 'admin_port': 'keystone_port'}) + signals.connect(haproxy_glance_api_config, glance_api_endpoint, {'listen_port': 'admin_port'}) + signals.connect(haproxy_glance_api_config, glance_api_endpoint, {'listen_port': 'port'}) has_errors = False @@ -197,6 +205,7 @@ def deploy(): time.sleep(10) #TODO fix keystone services to check if tables are created actions.resource_action(keystone_config2, 'run') actions.resource_action(keystone_service2, 'run') + actions.resource_action(haproxy_config, 'run') actions.resource_action(haproxy_service, 'run') time.sleep(10) #TODO fix haproxy to wait until it's ready @@ -212,11 +221,11 @@ def deploy(): actions.resource_action(glance_db, 'run') actions.resource_action(glance_db_user, 'run') actions.resource_action(glance_config, 'run') - actions.resource_action(glance_api_container, 'run') - time.sleep(10) #TODO fix actions.resource_action(glance_registry_container, 'run') - time.sleep(10) + time.sleep(10) #TODO fix + actions.resource_action(glance_api_container, 'run') actions.resource_action(glance_api_endpoint, 'run') + time.sleep(10) # test working configuration requests.get('http://%s:%s' % (keystone_service1.args['ip'].value, keystone_service1.args['port'].value)) @@ -242,7 +251,8 @@ def deploy(): requests.get('http://%s:%s' % (rabbitmq_service1.args['ip'].value, rabbitmq_service1.args['management_port'].value)) - requests.get('http://%s:%s' % (glance_api_container.args['ip'].value, glance_api_container.args['ports'].value[0]['value'][0]['value'])) + #requests.get('http://%s:%s' % (glance_api_container.args['ip'].value, glance_api_container.args['ports'].value[0]['value'][0]['value'])) + requests.get('http://%s:%s' % (glance_api_container.args['ip'].value, haproxy_glance_api_config.args['listen_port'].value)) requests.get( 'http://%s:%s' % (glance_registry_container.args['ip'].value, glance_registry_container.args['ports'].value[0]['value'][0]['value']), headers={'X-Auth-Token': token} diff --git a/resources/glance_api_service/actions/run.yml b/resources/glance_api_service/actions/run.yml index 567748b0..e3392a16 100644 --- a/resources/glance_api_service/actions/run.yml +++ b/resources/glance_api_service/actions/run.yml @@ -3,19 +3,15 @@ sudo: yes tasks: - docker: - command: /bin/bash -c "glance-manage db_sync && /usr/bin/glance-api" + #command: /bin/bash -c "glance-manage db_sync && /usr/bin/glance-api" + command: /usr/bin/glance-api name: {{ name }} image: {{ image }} state: running - net: host - {% if ports.value %} + expose: + - 9292 ports: - {% for port in ports.value %} - {% for p in port['value'] %} - - {{ p['value'] }}:{{ p['value'] }} - {% endfor %} - {% endfor %} - {% endif %} + - {{ ports.value[0]['value'][0]['value'] }}:9292 {% if host_binds.value %} volumes: # TODO: host_binds might need more work diff --git a/resources/glance_registry_service/actions/run.yml b/resources/glance_registry_service/actions/run.yml index 51b208b6..28cdcb12 100644 --- a/resources/glance_registry_service/actions/run.yml +++ b/resources/glance_registry_service/actions/run.yml @@ -3,8 +3,8 @@ sudo: yes tasks: - docker: - #command: /bin/bash -c "glance-manage db_sync && /usr/bin/glance-registry" - command: /usr/bin/glance-registry + command: /bin/bash -c "glance-manage db_sync && /usr/bin/glance-registry" + #command: /usr/bin/glance-registry name: {{ name }} image: {{ image }} state: running diff --git a/resources/haproxy_keystone_config/meta.yaml b/resources/haproxy_service_config/meta.yaml similarity index 100% rename from resources/haproxy_keystone_config/meta.yaml rename to resources/haproxy_service_config/meta.yaml