Fix a bug related to genconfig and iscsi

ansible-playbook was not called in one place - instead genconfig
was being called.  This exposed a problem where iscsi was not in
the site.yml file.  It further exposed a problem where the change
Id1b1cc3bb3c1790a77f9449ec5b0b5d1c67f91e4 was not applied.

Co-Authored-By: zhubingbing <zhu.bingbing@99cloud.net>
Change-Id: I0e731b233ab6b4d8182ae811e16c1aa398f40f39
Partially-Implements: blueprint move-config-to-kolla-k8s

ansible/roles/ironic/templates/ironic.conf.j2

@@ -19,7 +19,7 @@ api_workers = {{ openstack_service_workers }}
 
 {% if service_name == 'ironic-conductor' %}
 [conductor]
-api_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port }}
+api_url = {{ internal_protocol }}://ironic-api:{{ ironic_api_port }}
 automated_clean=false
 {% endif %}
 

ansible/roles/ironic/templates/pxelinux.default.j2

@@ -2,6 +2,6 @@ default introspect
 
 label introspect
 kernel ironic-agent.kernel
-append initrd=ironic-agent.initramfs ipa-inspection-callback-url=http://{{ kolla_internal_vip_address }}:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes
+append initrd=ironic-agent.initramfs ipa-inspection-callback-url=http://ironic-inspector:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes
 
 ipappend 3

ansible/roles/iscsi/tasks/config.yml

@@ -4,8 +4,6 @@
     path: "{{ node_config_directory }}/{{ item }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups['compute'] or
-        inventory_hostname in groups['storage']
   with_items:
     - "iscsid"
 
@@ -13,8 +11,6 @@
   template:
     src: "{{ item }}.json.j2"
     dest: "{{ node_config_directory }}/{{ item }}/config.json"
-  when: inventory_hostname in groups['compute'] or
-        inventory_hostname in groups['storage']
   with_items:
     - "iscsid"
 
@@ -25,7 +21,6 @@
     recurse: yes
   when:
     - enable_cinder_backend_lvm | bool
-    - inventory_hostname in groups['tgtd']
   with_items:
     - "tgtd"
 
@@ -35,6 +30,5 @@
     dest: "{{ node_config_directory }}/{{ item }}/config.json"
   when:
     - enable_cinder_backend_lvm | bool
-    - inventory_hostname in groups['tgtd']
   with_items:
     - "tgtd"

ansible/roles/nova/templates/nova.conf.j2

@@ -89,12 +89,13 @@ html5proxy_port = {{ nova_spicehtml5proxy_port }}
 {% if service_name == "nova-compute-ironic" %}
 [ironic]
 username = {{ ironic_keystone_user }}
-auth_url = {{ openstack_auth.auth_url }}/v3
+password = {{ ironic_keystone_password }}
+auth_url = {{ keystone_admin_url }}
 auth_type = password
 project_name = service
 user_domain_name = default
 project_domain_name = default
-api_endpoint = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port }}/v1
+api_endpoint = {{ internal_protocol }}://ironic-api:{{ ironic_api_port }}/v1
 {% endif %}
 
 [oslo_concurrency]

ansible/site.yml

@@ -5,6 +5,7 @@
   roles:
     - rabbitmq
     - mariadb
+    - iscsi
     - ceph
     - nova
     - neutron

tests/bin/setup_config_iscsi.sh

@@ -24,7 +24,7 @@ cat tests/conf/iscsi-all-in-one/kolla_kubernetes_config \
     >> etc/kolla-kubernetes/kolla-kubernetes.yml
 
 tools/generate_passwords.py
-kolla-ansible/tools/kolla-ansible genconfig
+ansible-playbook -e ansible_python_interpreter=/usr/bin/python -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml -e CONFIG_DIR=/etc/kolla ansible/site.yml
 
 crudini --set /etc/kolla/nova-compute/nova.conf libvirt virt_type qemu
 crudini --set /etc/kolla/nova-compute/nova.conf libvirt cpu_mode none