OpenStack: Split neutron config up into MANAGER, CONTROLLER and AGENT

This adds NEUTRON_ENABLE_{MANAGER,CONTROLLER,AGENT} to determine which
parts should be run on a node, so a network node has MANAGER enabled,
but doesn't need CONTROLLER or AGENT, since those will be run on the
controller and compute nodes respectively.

This works by the configuration extension selectively enabling systemd
units, with config-setup always being run, and db-setup run on the
controller node.

Rather than having the enable logic in 3 distinct setup services, their
dependencies have been augmented to run after appropriate setup services
if they are enabled, and to not run if their configuration hasn't been
created.

Change-Id: I7625074c94acfb49fc68660440609b0fe9c0052d

3 files changed, 99 insertions, 109 deletions

diff --git a/openstack/usr/share/openstack/neutron-config.yml b/openstack/usr/share/openstack/neutron-config.yml
new file mode 100644
index 00000000..97f4c76e
--- /dev/null
+++ b/openstack/usr/share/openstack/neutron-config.yml
@@ -0,0 +1,48 @@
+---
+- hosts: localhost
+  vars_files:
+  - "/etc/openstack/neutron.conf"
+  tasks:
+
+  - name: Create the neutron user.
+    user:
+        name: neutron
+        comment: Openstack Neutron Daemons
+        shell: /sbin/nologin
+        home: /var/lib/neutron
+
+  - name: Create the /var folders for neutron
+    file:
+        path: "{{ item }}"
+        state: directory
+        owner: neutron
+        group: neutron
+    with_items:
+    - /var/run/neutron
+    - /var/lock/neutron
+    - /var/log/neutron
+
+  - name: Get service tenant id needed in neutron.conf
+    shell: |
+           keystone \
+               --os-endpoint http://{{ CONTROLLER_HOST_ADDRESS|quote }}:35357/v2.0 \
+               --os-token {{ KEYSTONE_TEMPORARY_ADMIN_TOKEN|quote }} \
+               tenant-get service | grep id | tr -d " " | cut -d"|" -f3
+    register: tenant_service_id
+
+  - set_fact:
+        SERVICE_TENANT_ID: "{{ tenant_service_id.stdout }}"
+
+  - name: Create the directories needed for Neutron configuration files.
+    file:
+        path: /etc/{{ item }}
+        state: directory
+    with_lines:
+    - cd /usr/share/openstack &&  find neutron -type d
+
+  - name: Add configuration needed for neutron using templates
+    template:
+        src: /usr/share/openstack/{{ item }}
+        dest: /etc/{{ item }}
+    with_lines:
+    - cd /usr/share/openstack && find neutron -type f
diff --git a/openstack/usr/share/openstack/neutron-db.yml b/openstack/usr/share/openstack/neutron-db.yml
new file mode 100644
index 00000000..62340477
--- /dev/null
+++ b/openstack/usr/share/openstack/neutron-db.yml
@@ -0,0 +1,51 @@
+---
+- hosts: localhost
+  vars_files:
+  - "/etc/openstack/neutron.conf"
+  tasks:
+  - name: Create neutron service user in service tenatnt
+    keystone_user:
+        user: "{{ NEUTRON_SERVICE_USER }}"
+        password: "{{ NEUTRON_SERVICE_PASSWORD }}"
+        tenant: service
+        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
+
+  - name: Add admin role to neutron service user in service tenant
+    keystone_user:
+        role: admin
+        user: "{{ NEUTRON_SERVICE_USER }}"
+        tenant: service
+        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
+
+  - keystone_service:
+        name: neutron
+        type: network
+        description: Openstack Compute Networking
+        publicurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9696
+        internalurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9696
+        adminurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9696
+        region: regionOne
+        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
+
+  - name: Create postgresql user for neutron
+    postgresql_user:
+        name: "{{ NEUTRON_DB_USER }}"
+        password: "{{ NEUTRON_DB_PASSWORD }}"
+    sudo: yes
+    sudo_user: neutron
+
+  - name: Create database for neutron services
+    postgresql_db:
+        name: neutron
+        owner: "{{ NEUTRON_DB_USER }}"
+    sudo: yes
+    sudo_user: neutron
+
+  - name: Initiate neutron database
+    shell: |
+           neutron-db-manage \
+               --config-file /etc/neutron/neutron.conf \
+               --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
+               upgrade juno
+    sudo: yes
+    sudo_user: neutron
diff --git a/openstack/usr/share/openstack/neutron.yml b/openstack/usr/share/openstack/neutron.yml
deleted file mode 100644
index 7529a656..00000000
--- a/openstack/usr/share/openstack/neutron.yml
+++ /dev/null
@@ -1,109 +0,0 @@
----
-- hosts: localhost
-  vars_files:
-  - "/etc/openstack/neutron.conf"
-  tasks:
-
-  - name: Create the neutron user.
-    user:
-        name: neutron
-        comment: Openstack Neutron Daemons
-        shell: /sbin/nologin
-        home: /var/lib/neutron
-
-  - name: Create the /var folders for neutron
-    file:
-        path: "{{ item }}"
-        state: directory
-        owner: neutron
-        group: neutron
-    with_items:
-    - /var/run/neutron
-    - /var/lock/neutron
-    - /var/log/neutron
-
-  - name: Get service tenant id needed in neutron.conf
-    shell: |
-           keystone \
-               --os-endpoint http://{{ CONTROLLER_HOST_ADDRESS|quote }}:35357/v2.0 \
-               --os-token {{ KEYSTONE_TEMPORARY_ADMIN_TOKEN|quote }} \
-               tenant-get service | grep id | tr -d " " | cut -d"|" -f3
-    register: tenant_service_id
-
-  - set_fact:
-        SERVICE_TENANT_ID: "{{ tenant_service_id.stdout }}"
-
-  - name: Create the directories needed for Neutron configuration files.
-    file:
-        path: /etc/{{ item }}
-        state: directory
-    with_lines:
-    - cd /usr/share/openstack &&  find neutron -type d
-
-  - name: Add configuration needed for neutron using templates
-    template:
-        src: /usr/share/openstack/{{ item }}
-        dest: /etc/{{ item }}
-    with_lines:
-    - cd /usr/share/openstack && find neutron -type f
-
-  - name: Create neutron service user in service tenatnt
-    keystone_user:
-        user: "{{ NEUTRON_SERVICE_USER }}"
-        password: "{{ NEUTRON_SERVICE_PASSWORD }}"
-        tenant: service
-        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
-
-  - name: Add admin role to neutron service user in service tenant
-    keystone_user:
-        role: admin
-        user: "{{ NEUTRON_SERVICE_USER }}"
-        tenant: service
-        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
-
-  - keystone_service:
-        name: neutron
-        type: network
-        description: Openstack Compute Networking
-        publicurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9696
-        internalurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9696
-        adminurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9696
-        region: regionOne
-        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
-
-  - name: Create postgresql user for neutron
-    postgresql_user:
-        name: "{{ NEUTRON_DB_USER }}"
-        password: "{{ NEUTRON_DB_PASSWORD }}"
-    sudo: yes
-    sudo_user: neutron
-
-  - name: Create database for neutron services
-    postgresql_db:
-        name: neutron
-        owner: "{{ NEUTRON_DB_USER }}"
-    sudo: yes
-    sudo_user: neutron
-
-  - name: Initiate neutron database
-    shell: |
-           neutron-db-manage \
-               --config-file /etc/neutron/neutron.conf \
-               --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
-               upgrade juno
-    sudo: yes
-    sudo_user: neutron
-
-  - name: Enable and start openstack-neutron services
-    service:
-        name: "{{ item }}"
-        enabled: yes
-        state: started
-    with_items:
-    - openstack-neutron-ovs-cleanup.service
-    - openstack-neutron-server.service
-    - openstack-neutron-dhcp-agent.service
-    - openstack-neutron-l3-agent.service
-    - openstack-neutron-metadata-agent.service
-    - openstack-neutron-plugin-openvswitch-agent.service
-