Skip to content

Commit 76b1509

Browse files
committed
Upgrade from Ubuntu 14.04 to 16.04
1 parent f53cc1c commit 76b1509

File tree

8 files changed

+24
-22
lines changed

8 files changed

+24
-22
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ build
1414
builds
1515
geoserver.war
1616
geonodes.py
17+
ubuntu-xenial-16.04-cloudimg-console.log

README.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
DevOps tools for developing & deploying [GeoNode](http://geonode.org/), including [Ansible](https://www.ansible.com/), [Packer](https://www.packer.io/), [Vagrant](https://www.vagrantup.com/), and [Fabric](http://www.fabfile.org/) configuration files for building and managing Ubuntu and CentOS GeoNode boxes.
44

5+
After following the installation steps, continue to [Launch](#launch) section to start up GeoNode.
6+
57
# Installation
68

79
On the control/host machine, you'll need to install [Ansible](https://www.ansible.com/), [Packer](https://www.packer.io/), [Vagrant](https://www.vagrantup.com/), and [Fabric](http://www.fabfile.org).
@@ -112,13 +114,15 @@ vagrant box add --name "centos/6.4" http://developer.nrel.gov/downloads/vagrant-
112114
113115
```
114116

115-
To add an Ubuntu 14.04 ("Trusty") vagrant box to your control machine, run:
117+
To add an Ubuntu 16.04 LTS ("Xenial") vagrant box to your control machine, run:
116118

117119
```
118-
vagrant box add ubuntu/trusty64
120+
vagrant box add bento/ubuntu-16.04
119121
120122
```
121123

124+
Do no use `ubuntu/xenial64` from Ubuntu cloud images, as referenced here: https://bugs.launchpad.net/cloud-images/+bug/1569237.
125+
122126
To launch the GeoNode virtual machine run:
123127

124128
```
@@ -141,10 +145,10 @@ To build a base box for CentOS 6.4, run:
141145
packer build -var 'ansible_playbook=ansible/centos_base.yml' -var 'ansible_secret=secret.yml' -var 'ansible_os=centos' packer/centos64.json
142146
```
143147

144-
To build a base box for Ubuntu 14.04, run:
148+
To build a base box for Ubuntu 16.04, run:
145149

146150
```
147-
packer build -var 'ansible_playbook=ansible/ubuntu_base.yml' -var 'ansible_secret=secret.yml' -var 'ansible_os=ubuntu' packer/ubuntu1404.json
151+
packer build -var 'ansible_playbook=ansible/ubuntu_base.yml' -var 'ansible_secret=secret.yml' -var 'ansible_os=ubuntu' packer/ubuntu1604.json
148152
```
149153

150154
#### Adding Your New Box

Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
Vagrant.configure(2) do |config|
55

6-
config.vm.box = "ubuntu/trusty64"
6+
config.vm.box = "bento/ubuntu-16.04"
77

88
config.vm.network "forwarded_port", guest: 8000, host: 8000
99
config.vm.network "forwarded_port", guest: 8080, host: 8080

ansible/extra_roles/common/ubuntu/common_java_ubuntu/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
become_user: root
1212
alternatives: name=java path="{{ ALTERNATIVE_JAVA }}"
1313

14-
- name: "Install Ant & Maven2"
14+
- name: "Install Ant & Maven"
1515
become: yes
1616
become_user: root
1717
apt: name="{{ item }}" state=present
1818
with_items:
1919
- ant
20-
- maven2
20+
- maven

ansible/extra_roles/common/ubuntu/common_webserver_django_ubuntu/tasks/main.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@
2020
become_user: root
2121
apt: name="{{ item }}" state=latest
2222
with_items:
23-
- libgdal1h
23+
#- libgdal1h # Not required for GeoNode in Ubuntu 16.04 LTS
24+
#- numpy-dev # Not required for GeoNode development, but maybe for downstream projects
2425
- libgdal-dev
2526
- libgeos-dev
27+
#- libgeos-c1 # see https://groups.google.com/forum/#!topic/cartodb/CuDJs5Nm0ww
28+
- libgeos-c1v5 # see https://groups.google.com/forum/#!topic/cartodb/CuDJs5Nm0ww
2629
- libpq-dev
2730

2831
- name: Install Other Libraries

ansible/extra_roles/common/ubuntu/common_webserver_proxy_ubuntu/tasks/main.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
---
22

3-
- name: "Add Node.js repo"
4-
become: yes
5-
become_user: root
6-
apt_repository: repo="ppa:chris-lea/node.js" state=present
7-
8-
- name: Install Other Libraries
3+
- name: Install Node.js & NPM
94
become: yes
105
become_user: root
116
apt: name="{{ item }}" state=latest
127
with_items:
138
- nodejs
9+
- npm
1410

1511
- name: Install NPM Libraries
1612
become: yes

group_vars/all.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ IPTABLES_RULES:
1717

1818
# common_java_ubuntu
1919
PACKAGES_JAVA:
20-
- "openjdk-7-jdk"
20+
- "openjdk-8-jdk"
2121

22-
ALTERNATIVE_JAVA: "/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java"
22+
ALTERNATIVE_JAVA: "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java"
2323

2424
# common_db_centos
2525
PACKAGES_EPEL:
@@ -48,9 +48,7 @@ VENV_NAME: geonode
4848
VENV_PATH: "/home/vagrant/.venvs/geonode"
4949

5050
# geonode
51-
#PIP_VERSION: "6.1.1"
5251
PIP_VERSION: "8.1.1"
53-
GEOSERVER_WAR_LOCATION: "http://build.geonode.org/geoserver/latest/geoserver.war"
5452
POSTGIS_VERSION: "( 2, 0, 6 )"
55-
GDAL_VERSION: "1.10.0"
56-
GDAL_SOURCE: "http://pypi.python.org/packages/source/G/GDAL/GDAL-1.10.0.tar.gz"
53+
GDAL_VERSION: "2.1.0"
54+
GDAL_SOURCE: "https://pypi.python.org/packages/d1/98/27fff31ad298f3ec50db19dc3adfd8387279e158b1c6331c531c5fc7d830/GDAL-2.1.0.tar.gz"

packer/ubuntu1404.json packer/ubuntu1604.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"ansible_secret": "secret.yml",
66
"ansible_sys": "base",
77
"ansible_os": "ubuntu",
8-
"vagrant_box": "ubuntu-VAGRANTSLASH-trusty64",
9-
"output_box": "geonode-base-ubuntu-trusty64",
8+
"vagrant_box": "bento-VAGRANTSLASH-ubuntu-16.04",
9+
"output_box": "geonode-base-ubuntu-xenial64",
1010
"memory": 8192,
1111
"cpus": 4
1212
},

0 commit comments

Comments
 (0)