From 6a6ebd0c60611a5201291ff8e2e844437feab68a Mon Sep 17 00:00:00 2001 From: Egon Rijpkema Date: Thu, 22 Feb 2018 16:32:40 +0100 Subject: [PATCH] current state merlin --- merlin | 6 +++--- post-install.yml | 5 +---- site.yml | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/merlin b/merlin index 19976e9..5c46e08 100644 --- a/merlin +++ b/merlin @@ -1,9 +1,9 @@ [nova-compute] merlin-managementnode002 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.102 merlin-managementnode003 physical_interface_mappings=provider:enp5s0f1 overlay_ip=172.23.43.103 -merlin-node001 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.1 -merlin-node003 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.3 -merlin-node002 physical_interface_mappings=provider:enp130s0f1 overlay_ip=172.23.43.2 +merlin-node001 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.1 +merlin-node003 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.3 +merlin-node002 physical_interface_mappings=provider:enp130s0f0 overlay_ip=172.23.43.2 [databases] merlin-managementnode001 diff --git a/post-install.yml b/post-install.yml index cf002dc..a6e2e5f 100644 --- a/post-install.yml +++ b/post-install.yml @@ -16,10 +16,7 @@ command: docker exec -i keystone.service bash -c "source /root/admin-openrc.sh && {{ item }}" with_items: - openstack network create --share --external --provider-physical-network provider --provider-network-type flat provider - - > - openstack subnet create --network provider - --allocation-pool start={{ allocation_pool['start'] }},end={{ allocation_pool['end'] }} - --dns-nameserver {{ dns_nameserver }} --gateway {{ gateway }} --subnet-range {{ subnet_range }} providersub + - openstack network set --external provider - openstack flavor create --id 0 --vcpus 1 --ram 64 --disk 1 m1.nano - openstack keypair create --public-key /root/id_rsa.pub adminkey diff --git a/site.yml b/site.yml index d1d5f0f..fec288a 100644 --- a/site.yml +++ b/site.yml @@ -12,4 +12,4 @@ - include: nova-compute.yml - include: horizon.yml - include: heat.yml -- include: post-install.yml + #- include: post-install.yml