Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lisa Casino
slapos
Commits
a6ae3c01
Commit
a6ae3c01
authored
Sep 18, 2013
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use neutron instead of nova-network
parent
0ba2c989
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
22 deletions
+49
-22
software/openstack/instance-compute.cfg
software/openstack/instance-compute.cfg
+7
-0
software/openstack/instance-main.cfg
software/openstack/instance-main.cfg
+3
-2
software/openstack/software.cfg
software/openstack/software.cfg
+4
-9
software/openstack/templates/configure.sh.in
software/openstack/templates/configure.sh.in
+11
-1
software/openstack/templates/openstack-install.sh.in
software/openstack/templates/openstack-install.sh.in
+24
-10
No files found.
software/openstack/instance-compute.cfg
View file @
a6ae3c01
...
...
@@ -18,6 +18,7 @@ parts =
tunnel-ipv6-novadb
tunnel-ipv6-rabbit
tunnel-ipv6-ec2
tunnel-ipv6-neutron
nova-configure
websockify-sighandler
novnc-promise
...
...
@@ -184,6 +185,12 @@ ipv6-port = 8774
ipv4-port = 8774
runner-path = $${directory:services}/6tunnel-keystone-compute
[tunnel-ipv6-neutron]
<= tunnel-ipv4-to6
ipv6-port = 9696
ipv4-port = 9696
runner-path = $${directory:services}/6tunnel-neutron
[tunnel-ipv6-novnc]
<= tunnel-ipv6-base
ipv6-port = 6080
...
...
software/openstack/instance-main.cfg
View file @
a6ae3c01
...
...
@@ -10,6 +10,7 @@ parts =
websockify-sighandler
kvm-promise
novnc-promise
request-openstack-frontend
nova-install
# openstack-frontend-promise
publish-kvm-connection-information
...
...
@@ -83,7 +84,7 @@ controller-path = $${directory:scripts}/kvm_controller
ssh-port = 22222
use-tap = False
nat-rules = 22:$${:ssh-port} 80:$${tunnel-http:port} 443:$${tunnel-http:port-https} 5000:5000 6080:$${tunnel-http:port-vnc} 6082:6082 3333:3333 9292:9292 3306:3306 35357:35357
nat-rules = 22:$${:ssh-port} 80:$${tunnel-http:port} 443:$${tunnel-http:port-https} 5000:5000 6080:$${tunnel-http:port-vnc} 6082:6082 3333:3333 9292:9292
9696:9696
3306:3306 35357:35357
6tunnel-wrapper-path = $${directory:services}/6tunnel
virtual-hard-drive-url = $${slap-parameter:virtual-hard-drive-url}
...
...
@@ -310,4 +311,4 @@ virtual-hard-drive-url =
virtual-hard-drive-md5sum =
#Using devstack to auto install openstack. We just specify here the commit to use
devstack-revision = b567fc1f6b412d8fca8035d1cb5fecc4f4e5f6ac
\ No newline at end of file
devstack-revision = 0b29d86930fb9ba00dbb8e593b0a9fcee3559810
\ No newline at end of file
software/openstack/software.cfg
View file @
a6ae3c01
[buildout]
extends =
../../component/6tunnel/buildout.cfg
../../component/curl/buildout.cfg
...
...
@@ -36,14 +35,14 @@ eggs =
[template-openstack-main]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-main.cfg
md5sum =
9840a9dbb8ad336dc16b7deea815b6ea
md5sum =
1275a60636d8970090219c34d5312be6
output = ${buildout:directory}/template-openstack-main.cfg
mode = 0644
[template-openstack-compute]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-compute.cfg
md5sum =
4503b60e8ca90bdaeb014792bbab190c
md5sum =
8201cb19c6c23e8949dfa08a7436c079
output = ${buildout:directory}/template-openstack-compute.cfg
mode = 0644
...
...
@@ -63,7 +62,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[compute-script]
<= template-download
filename = configure.sh.in
md5sum = f
fabb8448fda7f95e47831dad133659f
md5sum = f
366e979f0cb2460f986270f8a80c236
[compute-script-run]
<= template-download
...
...
@@ -73,7 +72,7 @@ md5sum = e10b3796e028b65465a05b6a0c6f9762
[openstack-install]
<= template-download
filename = openstack-install.sh.in
md5sum =
0729848b62f50bc429f9df4d3caf12
ac
md5sum =
31b1008ebfff9e5dadc0e18fc8f07a
ac
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
...
...
@@ -141,16 +140,12 @@ Werkzeug = 0.9.4
apache-libcloud = 0.13.1
async = 0.6.1
buildout-versions = 1.7
cliff = 1.4.4
cmd2 = 0.6.5.1
gitdb = 0.5.4
itsdangerous = 0.23
lxml = 3.2.3
meld3 = 0.6.10
paramiko = 1.11.0
plone.recipe.command = 1.1
pycrypto = 2.6
requests = 1.2.3
slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2
slapos.recipe.download = 1.0.dev-r4053
...
...
software/openstack/templates/configure.sh.in
View file @
a6ae3c01
...
...
@@ -153,7 +153,7 @@ rabbit_host = ${:slap-ipv4}
osapi_compute_listen =
${
:slap-ipv4
}
keystone_ec2_url = http://
${
:slap-ipv4
}
:5000/v2.0/ec2tokens
default_floating_pool = public
iscsi_ip_prefix = 192.168.100
#
iscsi_ip_prefix = 192.168.100
fixed_range =
force_dhcp_release = True
dhcpbridge_flagfile = /etc/nova/nova.conf
...
...
@@ -165,6 +165,16 @@ auth_strategy = keystone
debug = True
verbose = True
# Network settings
network_api_class=nova.network.neutronv2.api.API
neutron_url=http://
${
:slap-ipv4
}
:9696
neutron_auth_strategy=keystone
neutron_admin_tenant_name=service
neutron_admin_username=neutron
neutron_admin_password=
${
:nova-passwd
}
neutron_admin_auth_url=http://
${
:slap-ipv4
}
:35357/v2.0
libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver
[osapi_v3]
enabled = True
...
...
software/openstack/templates/openstack-install.sh.in
View file @
a6ae3c01
...
...
@@ -5,15 +5,19 @@
REPO_URL
=
"
${
:nova-url
}
"
NOVA_CONFIG
=
"/etc/nova/nova.conf"
BASE_DIR
=
"/opt/openstack"
INSTALL_DIR
=
"/opt/stack"
INSTALL_LOG
=
"/opt/openstack/log"
NOVA_PASSWD
=
"
${
:nova-passwd
}
"
NOVA_USER
=
"
${
:nova-user
}
"
FLOATING_RANGE
=
172.24.4.224/28
GIT_EXEC
=
`
which git
`
IPv4
=
`
ip addr show eth0 |
grep
'inet '
|
awk
'{print $2}'
|
cut
-d
/
-f1
`
if
[
-z
"
$IPv4
"
]
;
then
IPv4
=
"127.0.0.1"
fi
apt-get update
if
[
-z
"
$GIT_EXEC
"
-o
!
-x
"
$GIT_EXEC
"
]
;
then
apt-get
install
-y
git
;
fi
...
...
@@ -35,21 +39,26 @@ SERVICE_TOKEN=$NOVA_PASSWD
SERVICE_PASSWORD=
$NOVA_PASSWD
ADMIN_PASSWORD=
$NOVA_PASSWD
SERVICE_HOST=
$IPv4
HOST_IP=
$IPv4
LOGFILE=
$INSTALL_LOG
/stack.sh.log
LOGDAYS=7
# Nova Network Configuration
PUBLIC_INTERFACE=br100
FLAT_INTERFACE=eth0
FLAT_NETWORK_BRIDGE_DEFAULT=br100
VLAN_INTERFACE=eth0
ISCSI_IP_PREFIX=192.168.100
FIXED_RANGE=
NET_MAN=FlatDHCPManager
MULTI_HOST=1
FIXED_RANGE=10.0.2.0/24
FIXED_NETWORK_SIZE=256
FLOATING_RANGE=
$FLOATING_RANGE
disable_service n-net
enable_service q-svc
enable_service q-agt
enable_service q-dhcp
enable_service q-l3
enable_service q-meta
enable_service neutron
# Optional, to enable tempest configuration as part of devstack
enable_service tempest
EOF
chmod
600
$BASE_DIR
/localrc
...
...
@@ -61,13 +70,18 @@ chown -R $NOVA_USER: $BASE_DIR
cd
$BASE_DIR
;
./stack.sh
#cd $BASE_DIR; ./local.sh
if
grep
"
/opt/stack/openstack
/rejoin-stack.sh"
/etc/rc.local
>
/dev/null
if
grep
"
$BASE_DIR
/rejoin-stack.sh"
/etc/rc.local
>
/dev/null
then
echo
"Skipping configuring rc.local file..."
else
sudo sed
-n
'$!p'
/etc/rc.local
>
temp-rc.local
;
sudo mv
temp-rc.local /etc/rc.local
;
sudo echo
-e
"/opt/stack/openstack/rejoin-stack.sh
\n\n
exit 0"
>>
/etc/rc.local
;
sudo echo
-e
"sudo losetup -f
$INSTALL_DIR
/data/stack-volumes-backing-file
\n
$BASE_DIR
/rejoin-stack.sh > /dev/null
\n\n
exit 0"
>>
/etc/rc.local
;
sudo chmod
+x /etc/rc.local
fi
#Allow openstack images to access to internet
#sudo iptables -t nat -A POSTROUTING -s $FLOATING_RANGE -j MASQUERADE
exit
0
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment