Add support for neutron, glance, keystone+cleanup

defaults/main.yml

@@ -51,20 +51,20 @@ ironic_service_proto: http
 ironic_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(ironic_service_proto) }}"
 ironic_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(ironic_service_proto) }}"
 ironic_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(ironic_service_proto) }}"
-ironic_service_port: 8774
-ironic_service_description: "Ironic Baremetal Service"
-ironic_service_publicuri: "{{ ironic_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ ironic_service_port }}"
-ironic_service_publicurl: "{{ ironic_service_publicuri }}/v2.1/%(tenant_id)s"
+ironic_service_port: 6385
+ironic_service_description: "Ironic baremetal provisioning service"
+#ironic_service_publicuri: "{{ ironic_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ ironic_service_port }}"
+ironic_service_publicuri: "{{ ironic_service_publicuri_proto }}://{{ internal_lb_vip_address }}:{{ ironic_service_port }}"
+ironic_service_publicurl: "{{ ironic_service_publicuri }}"
 ironic_service_adminuri: "{{ ironic_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ ironic_service_port }}"
-ironic_service_adminurl: "{{ ironic_service_adminuri }}/v2.1/%(tenant_id)s"
+ironic_service_adminurl: "{{ ironic_service_adminuri }}"
 ironic_service_internaluri: "{{ ironic_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ ironic_service_port }}"
-ironic_service_internalurl: "{{ ironic_service_internaluri }}/v2.1/%(tenant_id)s"
+ironic_service_internalurl: "{{ ironic_service_internaluri }}"
 ironic_program_name: ironic-api
 ironic_service_region: RegionOne
 ironic_service_project_name: "service"
 ironic_service_project_domain_id: default
 ironic_service_user_domain_id: default
-ironic_service_user_name: "ironic"
 ironic_service_role_name: "admin"
 
 ironic_service_in_ldap: False
@@ -108,14 +108,13 @@ ironic_recreate_keys: False
 
 ironic_bin: "{{ ironic_venv_bin }}"
 
-ironic_service_name: ironic
-
 ironic_common_apt_packages:
   - python-dev
   - python-pip
   - git
 
 ironic_common_pip_packages:
+  - python-keystoneclient
   - virtualenvwrapper
 
 ironic_pip_packages:

templates/ironic.conf.j2

@@ -999,7 +999,7 @@ dhcp_provider={{ ironic_dhcp_provider }}
 #
 
 # Default glance hostname or IP address. (string value)
-#glance_host=$my_ip
+glance_host={{ external_lb_vip_address }}
 
 # Default glance port. (integer value)
 #glance_port=9292
@@ -1389,7 +1389,7 @@ auth_strategy={{ ironic_auth_strategy }}
 # Complete admin Identity API endpoint. This should specify
 # the unversioned root endpoint e.g. https://localhost:35357/
 # (string value)
-#identity_uri=<None>
+identity_uri={{ keystone_service_publicuri }}
 
 # This option is deprecated and may be removed in a future
 # release. Single shared secret with the Keystone
@@ -1400,13 +1400,13 @@ auth_strategy={{ ironic_auth_strategy }}
 #admin_token=<None>
 
 # Service username. (string value)
-#admin_user=<None>
+admin_user={{ ironic_service_user_name }}
 
 # Service user password. (string value)
-#admin_password=<None>
+admin_password={{ ironic_service_password }}
 
 # Service tenant name. (string value)
-#admin_tenant_name=admin
+admin_tenant_name={{ ironic_service_project_name }}
 
 
 [matchmaker_redis]
@@ -1432,7 +1432,7 @@ auth_strategy={{ ironic_auth_strategy }}
 #
 
 # URL for connecting to neutron. (string value)
-#url=http://$my_ip:9696
+url={{ neutron_service_publicuri }}
 
 # Timeout value for connecting to neutron in seconds. (integer
 # value)