aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-04-16 18:59:28 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-16 18:59:28 +0000
commitcf7a2042c88b7079ef829a62ef2d468afef7bd1b (patch)
tree239ef45da6cf6d2867d4a4bd5bc0ba8583e34272
parent38322831c7591dbecc41e4d90a38a556c1c47230 (diff)
parent87ff9f85c1c270a9b8533918701fa920a181d750 (diff)
Merge "Update AAF installation with Heat"
-rw-r--r--boot/aaf_install.sh22
-rw-r--r--heat/ONAP/onap_openstack.env2
-rw-r--r--heat/ONAP/onap_openstack.yaml8
-rw-r--r--heat/ONAP/onap_openstack_light.yaml6
4 files changed, 33 insertions, 5 deletions
diff --git a/boot/aaf_install.sh b/boot/aaf_install.sh
index 4c7c8d7a..bc7e28e5 100644
--- a/boot/aaf_install.sh
+++ b/boot/aaf_install.sh
@@ -51,7 +51,7 @@ fi
echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list
echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list
apt-get update
-apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
+apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make maven
# Download scripts from Nexus
curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aaf_vm_init.sh -o /opt/aaf_vm_init.sh
@@ -62,7 +62,7 @@ mv /opt/aaf_serv.sh /etc/init.d
update-rc.d aaf_serv.sh defaults
# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | tee /etc/apt/sources.list.d/docker.list
+echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | tee /etc/apt/sources.list.d/docker.list
apt-get update
apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
apt-get install -y --allow-unauthenticated docker-engine
@@ -97,4 +97,22 @@ git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
chmod +x /opt/authz/auth/auth-cass/docker/dinstall.sh
chmod +x /opt/authz/auth/docker/drun.sh
chmod +x /opt/authz/auth/docker/d.props
+
+cd /opt/authz
+#Need to update /usr/share/maven/conf/settings.xml
+mvn install -Dmaven.test.skip=true
+
+# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes
+if [[ $CLOUD_ENV != "rackspace" ]]
+then
+ sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
+ grub-mkconfig -o /boot/grub/grub.cfg
+ sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg
+ sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules
+ echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
+ echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic
+ reboot
+fi
+
+cd /opt
./aaf_vm_init.sh \ No newline at end of file
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 329b677c..8ed1986e 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -134,6 +134,7 @@ parameters:
vnfsdk_branch: master
music_branch: master
nbi_branch: master
+ aaf_branch: master
aai_docker: 1.2-STAGING-latest
aai_sparky_docker: 1.2-STAGING-latest
@@ -224,3 +225,4 @@ parameters:
vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
music_repo: http://gerrit.onap.org/r/music.git
nbi_repo: http://gerrit.onap.org/r/externalapi/nbi.git
+ aaf_repo: http://gerrit.onap.org/r/aaf/authz.git \ No newline at end of file
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 4445dd38..c5ffdaff 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -298,6 +298,8 @@ parameters:
type: string
nbi_repo:
type: string
+ aaf_repo:
+ type: string
################################
# #
@@ -493,6 +495,8 @@ parameters:
type: string
nbi_branch:
type: string
+ aaf_branch:
+ type: string
#############
# #
@@ -1860,7 +1864,7 @@ resources:
__dcae_ph_docker__: { get_param: dcae_ph_docker }
__dcae_sch_docker__: { get_param: dcae_sch_docker }
__dcae_heartbeat_docker__: { get_param: dcae_heartbeat_docker }
- __dcae_prh_docker__: { get_param: dcaeprh_docker }
+ __dcae_prh_docker__: { get_param: dcae_prh_docker }
__holmes_em_docker__: { get_param: holmes_em_docker }
__holmes_rm_docker__: { get_param: holmes_rm_docker }
@@ -2107,7 +2111,7 @@ resources:
aaf_vm:
type: OS::Nova::Server
properties:
- image: { get_param: ubuntu_1404_image }
+ image: { get_param: ubuntu_1604_image }
flavor: { get_param: flavor_medium }
name:
str_replace:
diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml
index 17266b25..79fffad9 100644
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -294,6 +294,8 @@ parameters:
type: string
nbi_repo:
type: string
+ aaf_repo:
+ type: string
################################
# #
@@ -416,6 +418,8 @@ parameters:
type: string
nbi_branch:
type: string
+ aaf_branch:
+ type: string
#############
# #
@@ -1985,7 +1989,7 @@ resources:
aaf_vm:
type: OS::Nova::Server
properties:
- image: { get_param: ubuntu_1404_image }
+ image: { get_param: ubuntu_1604_image }
flavor: { get_param: flavor_medium }
name:
str_replace: