diff --git a/multi-node-aio/playbooks/deploy-dhcp.yml b/multi-node-aio/playbooks/deploy-dhcp.yml index cb83cd8c..ac3c9bbd 100644 --- a/multi-node-aio/playbooks/deploy-dhcp.yml +++ b/multi-node-aio/playbooks/deploy-dhcp.yml @@ -65,6 +65,7 @@ name: "{{ item }}" state: restarted with_items: "{{ mnaio_dhcp_distro_packages }}" + vars_files: - vars/main.yml tags: diff --git a/multi-node-aio/playbooks/deploy-osa.yml b/multi-node-aio/playbooks/deploy-osa.yml index f554c6d8..ad1b0b4f 100644 --- a/multi-node-aio/playbooks/deploy-osa.yml +++ b/multi-node-aio/playbooks/deploy-osa.yml @@ -13,49 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Wait for deploy host - hosts: openstack_hosts - gather_facts: false - pre_tasks: - - name: Wait for container connectivity - wait_for_connection: - connect_timeout: 5 - sleep: 10 - timeout: 1200 - tasks: - - name: copy host keys - copy: - src: "{{ item.src }}" - dest: "{{ item.dest }}" - mode: "0600" - with_items: - - src: /root/.ssh/id_rsa - dest: /root/.ssh/id_rsa - - src: /root/.ssh/id_rsa.pub - dest: /root/.ssh/id_rsa.pub - - - name: un-mount deleteme mount - mount: - name: "/deleteme" - state: unmounted - - - name: remote deleteme mount - mount: - name: "/deleteme" - state: absent - - - name: Remove deleteme dir - file: - path: "/deleteme" - state: absent - - - name: Remove deleteme lv - lvol: - vg: vg00 - lv: deleteme00 - force: true - state: absent - - name: Setup cinder host volume hosts: cinder_hosts gather_facts: false @@ -72,6 +29,11 @@ vg: cinder-volumes pvs: "/dev/vg00/cinder-volumes00" + vars_files: + - vars/main.yml + tags: + - deploy-osa + - name: Setup cinder host volume hosts: swift_hosts @@ -119,6 +81,12 @@ - disk2 - disk3 + vars_files: + - vars/main.yml + tags: + - deploy-osa + + - name: Setup deploy host hosts: deploy_hosts gather_facts: "{{ gather_facts | default(true) }}" @@ -144,13 +112,6 @@ when: - pre_config_osa | default(true) | bool - - name: Create Basic configs - shell: cp -R etc/openstack_deploy/* /etc/openstack_deploy - args: - chdir: /opt/openstack-ansible - when: - - pre_config_osa | default(true) | bool - - name: Create base directories file: path: "{{ item }}" @@ -165,6 +126,13 @@ when: - pre_config_osa | default(true) | bool + - name: Create Basic configs + shell: cp -R etc/openstack_deploy/* /etc/openstack_deploy + args: + chdir: /opt/openstack-ansible + when: + - pre_config_osa | default(true) | bool + - name: Drop osa config template: src: "osa/openstack_user_config.yml" @@ -193,7 +161,9 @@ - pre_config_osa | default(true) | bool - name: Get pip2 and pw gen deps - command: python2 /opt/get-pip.py pycrypto pyyaml + shell: | + python2 /opt/get-pip.py + $(which pip2 || which pip) install setuptools pycrypto pyyaml args: chdir: /opt/openstack-ansible when: @@ -226,3 +196,8 @@ to the {{ groups['deploy_hosts'][0] }} VM and attach to the "build-osa" tmux session. when: - run_osa | default(true) | bool + + vars_files: + - vars/main.yml + tags: + - deploy-osa diff --git a/multi-node-aio/playbooks/deploy-vms.yml b/multi-node-aio/playbooks/deploy-vms.yml index a52df53e..d1ebba31 100644 --- a/multi-node-aio/playbooks/deploy-vms.yml +++ b/multi-node-aio/playbooks/deploy-vms.yml @@ -63,4 +63,69 @@ vars_files: - vars/main.yml tags: - - setup-host + - deploy-vms + + +- name: Create vm_servers group + hosts: localhost + gather_facts: false + tasks: + - name: Servers group + add_host: + name: "{{ item.server_vm_fixed_addr }}" + groups: vm_servers + with_items: "{{ servers }}" + + vars_files: + - vars/main.yml + tags: + - deploy-vms + + +- name: Wait for deploy host + hosts: vm_servers + gather_facts: false + pre_tasks: + - name: Wait for container connectivity + wait_for_connection: + connect_timeout: 5 + sleep: 10 + timeout: 1200 + tasks: + - name: copy host keys + copy: + src: "{{ item.src }}" + dest: "{{ item.dest }}" + mode: "0600" + with_items: + - src: /root/.ssh/id_rsa + dest: /root/.ssh/id_rsa + - src: /root/.ssh/id_rsa.pub + dest: /root/.ssh/id_rsa.pub + + - name: un-mount deleteme mount + mount: + name: "/deleteme" + state: unmounted + + - name: remote deleteme mount + mount: + name: "/deleteme" + state: absent + + - name: Remove deleteme dir + file: + path: "/deleteme" + state: absent + + - name: Remove deleteme lv + lvol: + vg: vg00 + lv: deleteme00 + force: true + state: absent + + vars_files: + - vars/main.yml + tags: + - deploy-vms \ No newline at end of file diff --git a/multi-node-aio/playbooks/pxe/debian/mnaio-bridges.cfg.j2 b/multi-node-aio/playbooks/pxe/debian/mnaio-bridges.cfg.j2 index ac359843..b0c9c07b 100644 --- a/multi-node-aio/playbooks/pxe/debian/mnaio-bridges.cfg.j2 +++ b/multi-node-aio/playbooks/pxe/debian/mnaio-bridges.cfg.j2 @@ -1,10 +1,13 @@ # Physical interface, could be bond. This only needs to be set once {% for key, value in mnaio_host_networks.items() %} -{% if value.iface_port != 'none' %} +{% if value.iface_port != 'none' %} auto {{ value.iface_port }} iface {{ value.iface_port }} inet manual -{% endif %} +{% endif %} +{% endfor %} + +{% for key, value in mnaio_host_networks.items() %} auto {{ value.iface }} iface {{ value.iface }} inet {{ value.inet_type }} bridge_stp off diff --git a/multi-node-aio/playbooks/pxe/debian/vm-bridges.cfg.j2 b/multi-node-aio/playbooks/pxe/debian/vm-bridges.cfg.j2 index 0fb421e5..e2c56074 100644 --- a/multi-node-aio/playbooks/pxe/debian/vm-bridges.cfg.j2 +++ b/multi-node-aio/playbooks/pxe/debian/vm-bridges.cfg.j2 @@ -1,18 +1,23 @@ # Physical interface, could be bond. This only needs to be set once {% for key, value in item.server_networks.items()|sort(attribute='1.iface') %} +{% if value.iface is defined %} auto {{ value.iface }} iface {{ value.iface }} inet manual +{% endif %} +{% endfor %} + +{% for key, value in item.server_networks.items()|sort(attribute='1.iface') %} auto br-{{ key }} iface br-{{ key }} inet {{ value.inet_type }} bridge_stp off bridge_waitport 10 bridge_fd 0 - bridge_ports {{ value.iface }} + bridge_ports {{ value.iface | default('none') }} offload-sg off -{% if value.address is defined %} +{% if value.address is defined %} address {{ value.address }} -{% endif %} +{% endif %} {% endfor %}