Resolving minor issues with Magnum role that prevented installation from

succeeding.

Adding missing 'MySQL-python' dependency to
magnum_pip_packages
Adding path to 'magnum-db-manage' call to resolve pathing
issue with virtual environment
Adding missing 'Restart magnum services' handler
Removing libmysqlclient-dev from magnum_apt_packages due to conflict
with Galera packages
Correcting '*_proto' to '*_protocol'

Change-Id: I746ecb21ebfda70e207f239306e1ec38785917cb

defaults/main.yml

@@ -33,12 +33,12 @@ magnum_service_role_names:
   - admin
 magnum_service_region: RegionOne
 magnum_bind_port: 9511
-magnum_service_publicuri_protocol: http
-magnum_service_publicurl: "{{ magnum_service_publicuri_protocol }}://{{ external_lb_vip_address }}:{{ magnum_bind_port }}"
-magnum_service_internaluri_protocol: http
-magnum_service_internalurl: "{{ magnum_service_internaluri_protocol }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"
-magnum_service_adminuri_protocol: http
-magnum_service_adminurl: "{{ magnum_service_adminuri_protocol }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"
+magnum_service_publicuri_proto: http
+magnum_service_publicurl: "{{ magnum_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ magnum_bind_port }}"
+magnum_service_internaluri_proto: http
+magnum_service_internalurl: "{{ magnum_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"
+magnum_service_adminuri_proto: http
+magnum_service_adminurl: "{{ magnum_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"
 
 magnum_config_overrides: {}
 magnum_policy_overrides: {}
@@ -80,8 +80,15 @@ magnum_service_project_domain_name: Default
 magnum_service_user_domain_name: default
 magnum_service_project_name: service
 
+magnum_requires_pip_packages:
+  - httplib2
+  - python-keystoneclient
+  - virtualenv
+  - virtualenv-tools
+
 magnum_pip_packages:
   - Babel
+  - MySQL-python
   - PrettyTable
   - PyYAML
   - SQLAlchemy

extras/group_vars_magnum.yml

@@ -1,9 +1,9 @@
 ## Magnum
 magnum_service_port: 9511
 magnum_service_proto: http
-magnum_service_publicuri_protocol: "{{ openstack_service_adminuri_proto | default(magnum_service_proto) }}"
-magnum_service_internaluri_protocol: "{{ openstack_service_adminuri_proto | default(magnum_service_proto) }}"
-magnum_service_adminuri_protocol: "{{ openstack_service_adminuri_proto | default(magnum_service_proto) }}"
+magnum_service_publicuri_proto: "{{ openstack_service_adminuri_proto | default(magnum_service_proto) }}"
+magnum_service_internaluri_proto: "{{ openstack_service_adminuri_proto | default(magnum_service_proto) }}"
+magnum_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(magnum_service_proto) }}"
 magnum_service_user_name: magnum
 magnum_service_project_name: service
 magnum_service_project_domain_id: default

handlers/main.yml

@@ -1,2 +1,9 @@
 ---
 # handlers file for openstack-ansible-magnum
+- name: Restart magnum services
+  service:
+    name: "{{ item }}"
+    state: restarted
+  with_items:
+    - "{{ magnum_api_program_name }}"
+    - "{{ magnum_conductor_program_name }}"

tasks/database-setup.yml

@@ -44,7 +44,7 @@
     - magnum-setup
 
 - name: Perform a synchronization of the Magnum database
-  command: "magnum-db-manage upgrade"
+  command: "{{ magnum_venv_bin}}/magnum-db-manage upgrade"
   sudo: yes
   sudo_user: "{{ magnum_system_user_name }}"
   tags:

vars/debian.yml

@@ -21,7 +21,6 @@ magnum_apt_packages:
   - python-dev
   - libssl-dev
   - libxml2-dev
-  - libmysqlclient-dev
   - libxslt-dev
   - libpq-dev
   - git