fix endpoints, dns, and deploy issues 94/1894/2
authordavidplunkett <dp7642@att.com>
Fri, 1 Nov 2019 07:33:33 +0000 (07:33 +0000)
committerdavidplunkett <dp7642@att.com>
Fri, 1 Nov 2019 07:37:05 +0000 (07:37 +0000)
Signed-off-by: davidplunkett <dp7642@att.com>
Change-Id: I9ea37cc665ed1a21dd9845c018cb178d0a10907a
Signed-off-by: davidplunkett <dp7642@att.com>
dellgen10-sriov-a13.yaml
site_type/sriov-a13/templates/networks/common-addresses.j2
site_type/sriov-a13/treasuremap.tgz
tools/1prom-gen.sh
tools/2genesis.sh
tools/deploy_site.sh
tools/generate_yamls.sh
version.properties

index b15ed46..2f4e771 100644 (file)
@@ -43,6 +43,8 @@ networks:
     vlan: 41
     interface: bond0.41
     cidr: 192.168.2.0/24
+    ingress_vip: 192.168.2.49
+    maas_vip: 192.168.2.48
     routes:
        gateway: 192.168.2.200
     ranges:
@@ -116,10 +118,11 @@ networks:
 dns:
   upstream_servers:
     - 192.168.2.85
-    - 8.8.8.8
-    - 8.8.4.4
-  ingress_domain: dellgen10.akraino.org
-  domain: lab.akraino.org
+    - 192.168.1.85
+    #- 8.8.8.8
+    #- 8.8.4.4
+  ingress_domain: dellgen10.lab.akraino.org
+  domain: dellgen10.lab.akraino.org
 gpu:
   alias:
     - name: "P4"
@@ -312,7 +315,7 @@ kubernetes:
   api_service_ip: 10.96.0.1
   etcd_service_ip: 10.96.0.2
   pod_cidr: 10.98.0.0/16
-  service_cidr: 10.96.0.0/15
+  service_cidr: 10.96.0.0/16
 regional_server:
   ip: 135.16.101.85
 ...
index b738f5d..73acdb7 100644 (file)
@@ -38,8 +38,8 @@ data:
 {% endfor %}
 {% endif %}
   vip:
-    ingress_vip: '{{yaml.networks.host.ranges.static.end}}/32'
-    maas_vip: '{{yaml.networks.host.ranges.static.end}}/32'
+    ingress_vip: '{{yaml.networks.host.ingress_vip}}/32'
+    maas_vip: '{{yaml.networks.host.maas_vip}}/32'
 
   dns:
     # Kubernetes cluster domain. Do not change. This is internal to the cluster.
index 64ffa65..bd3d18d 100644 (file)
Binary files a/site_type/sriov-a13/treasuremap.tgz and b/site_type/sriov-a13/treasuremap.tgz differ
index e99970b..2852a28 100755 (executable)
@@ -67,59 +67,6 @@ else
   cd $YAML_BUILDS
 fi
 
-create_directories() {
-   mkdir -p ./tars/$SITE/configs/promenade
-   mkdir -p ./tars/$SITE/configs/promenade-bundle
-}
-
-get_site_config(){
-   $YAML_BUILDS/tools/pegleg.sh site -p /site -a /global collect ${SITE} -s /site/tars/$SITE/configs/promenade
-}
-
-gen_certs() {
-   docker run --env http_proxy=$http_proxy  --env https_proxy=$https_proxy --user 0 --rm -t -w /target -v $(pwd):/target ${PROMENADE_IMAGE} promenade generate-certs -o /target/tars/$SITE/configs/promenade /target/tars/$SITE/configs/promenade/*.yaml
-}
-
-gen_bundle(){
-   docker run --env http_proxy=$http_proxy  --env https_proxy=$https_proxy --user 0 --rm -t -w /target -v $(pwd):/target ${PROMENADE_IMAGE} promenade build-all --validators -o /target/tars/$SITE/configs/promenade-bundle /target/tars/$SITE/configs/promenade/*.yaml
-}
-
-create_scripts() {
-  KEYSTONE_IMAGE=$(grep "keystone_db_sync: docker.io" $AIRSHIP_TREASUREMAP/global/v4.0/software/config/versions.yaml | uniq | awk '{print $2}')
-  SHIPYARD_IMAGE=$(grep "shipyard_db_sync" $AIRSHIP_TREASUREMAP/global/v4.0/software/config/versions.yaml | uniq | awk '{print $2}')
-
-  DRYDOCK_PASSWORD=$(grep "^data:" $YAML_BUILDS/site/$SITE/secrets/passphrases/ucp_drydock_keystone_password.yaml | awk '{print $2}')
-  SHIPYARD_PASSWORD=$(grep "^data:" $YAML_BUILDS/site/$SITE/secrets/passphrases/ucp_shipyard_keystone_password.yaml | awk '{print $2}')
-  REGION_NAME=$SITE
-
-  cp $YAML_BUILDS/tools/deploy_site.sh $YAML_BUILDS/tars/$SITE/
-  sed -i -e "s,KEYSTONE_IMAGE=,KEYSTONE_IMAGE=$KEYSTONE_IMAGE,g" $YAML_BUILDS/tars/$SITE/deploy_site.sh
-  sed -i -e "s,SHIPYARD_IMAGE=,SHIPYARD_IMAGE=$SHIPYARD_IMAGE,g" $YAML_BUILDS/tars/$SITE/deploy_site.sh
-  sed -i -e "s/DRYDOCK_PASSWORD=/DRYDOCK_PASSWORD=$DRYDOCK_PASSWORD/g" $YAML_BUILDS/tars/$SITE/deploy_site.sh
-  sed -i -e "s/SHIPYARD_PASSWORD=/SHIPYARD_PASSWORD=$SHIPYARD_PASSWORD/g" $YAML_BUILDS/tars/$SITE/deploy_site.sh
-  sed -i -e "s/REGION_NAME=/REGION_NAME=$REGION_NAME/g" $YAML_BUILDS/tars/$SITE/deploy_site.sh
-  sed -i -e "s/{{yaml.genesis.host}}/$GENESIS_HOST/g" $YAML_BUILDS/tars/$SITE/deploy_site.sh
-
-  cp $YAML_BUILDS/tools/update_iptables.sh $YAML_BUILDS/tars/$SITE/
-  sed -i -e "s,HOST_INTERFACE=,HOST_INTERFACE=$HOST_INTERFACE,g" $YAML_BUILDS/tars/$SITE/update_iptables.sh
-  sed -i -e "s,PXE_INTERFACE=,PXE_INTERFACE=$PXE_INTERFACE,g" $YAML_BUILDS/tars/$SITE/update_iptables.sh
-
-  cp $YAML_BUILDS/tools/cleanup.sh $YAML_BUILDS/tars/$SITE/
-}
-
-prepare_tar(){
-   rm -f ./tars/promenade-bundle-$SITE.tar
-   tar cvf ./tars/promenade-bundle-$SITE.tar -C ./tars/$SITE .
-}
-
-#create_directories
-#get_site_config
-#gen_certs
-#gen_bundle
-#create_scripts
-#prepare_tar
-
-(
 echo "# Collecting config files in $AIRSHIP_TREASUREMAP/site/$SITE"
 cd $AIRSHIP_TREASUREMAP
 rm -rf $AIRSHIP_TREASUREMAP/${SITE}_collected
@@ -166,21 +113,17 @@ $AIRSHIP_TREASUREMAP/tools/airship promenade build-all --validators -o /target/$
 
 (
 echo "# Copying scripts to $AIRSHIP_TREASUREMAP/${SITE}_bundle"
-  #KEYSTONE_IMAGE=$(grep "keystone_db_sync: docker.io" $AIRSHIP_TREASUREMAP/global/software/config/versions.yaml | uniq | awk '{print $2}')
-  SHIPYARD_IMAGE=$(grep "shipyard_db_sync" $AIRSHIP_TREASUREMAP/global/software/config/versions.yaml | uniq | awk '{print $2}')
-
-  DRYDOCK_PASSWORD=$(grep "^data:" $AIRSHIP_TREASUREMAP/site/$SITE/secrets/passphrases/ucp_drydock_keystone_password.yaml | awk '{print $2}')
   SHIPYARD_PASSWORD=$(grep "^data:" $AIRSHIP_TREASUREMAP/site/$SITE/secrets/passphrases/ucp_shipyard_keystone_password.yaml | awk '{print $2}')
+  AUTH_DOMAIN=$(grep "ingress_domain:" $AIRSHIP_TREASUREMAP/site/$SITE/networks/common-addresses.yaml | awk '{print $2}')
+  AUTH_URL="http:\/\/iam-sw.${AUTH_DOMAIN}:80\/v3"
   REGION_NAME=$SITE
 
   DEPLOY_SCRIPT=$AIRSHIP_TREASUREMAP/${SITE}_bundle/deploy_site.sh
   IPTABLES_SCRIPT=$AIRSHIP_TREASUREMAP/${SITE}_bundle/update_iptables.sh
 
   cp $YAML_BUILDS/tools/deploy_site.sh $AIRSHIP_TREASUREMAP/${SITE}_bundle
-  sed -i -e "s,KEYSTONE_IMAGE=,KEYSTONE_IMAGE=$KEYSTONE_IMAGE,g" $DEPLOY_SCRIPT
-  sed -i -e "s,SHIPYARD_IMAGE=,SHIPYARD_IMAGE=$SHIPYARD_IMAGE,g" $DEPLOY_SCRIPT
-  sed -i -e "s/DRYDOCK_PASSWORD=/DRYDOCK_PASSWORD=$DRYDOCK_PASSWORD/g" $DEPLOY_SCRIPT
-  sed -i -e "s/SHIPYARD_PASSWORD=/SHIPYARD_PASSWORD=$SHIPYARD_PASSWORD/g" $DEPLOY_SCRIPT
+  sed -i -e "s|OS_AUTH_URL=|OS_AUTH_URL=\"${AUTH_URL}\"|g" $DEPLOY_SCRIPT
+  sed -i -e "s/OS_PASSWORD=/OS_PASSWORD=$SHIPYARD_PASSWORD/g" $DEPLOY_SCRIPT
   sed -i -e "s/REGION_NAME=/REGION_NAME=$REGION_NAME/g" $DEPLOY_SCRIPT
   sed -i -e "s/{{yaml.genesis.host}}/$GENESIS_HOST/g" $DEPLOY_SCRIPT
 
@@ -195,14 +138,13 @@ echo "# Copying scripts to $AIRSHIP_TREASUREMAP/${SITE}_bundle"
     echo "# Generating Promenade tar bundle $YAML_BUILDS/tars/promenade-bundle-$SITE.tar"
     mkdir -p $YAML_BUILDS/tars
     rm -f $YAML_BUILDS/tars/promenade-bundle-$SITE.tar
-    tar cvf $YAML_BUILDS/tars/promenade-bundle-$SITE.tar -C $AIRSHIP_TREASUREMAP/${SITE}_bundle .
+    tar cvf $YAML_BUILDS/tars/promenade-bundle-$SITE.tar --transform 's,^,configs/promenade-bundle/,' -C $AIRSHIP_TREASUREMAP/${SITE}_bundle .
+    tar rvf $YAML_BUILDS/tars/promenade-bundle-$SITE.tar --transform 's,^,configs/promenade/,' -C $AIRSHIP_TREASUREMAP/${SITE}_collected  .
+    tar rvf $YAML_BUILDS/tars/promenade-bundle-$SITE.tar -C $AIRSHIP_TREASUREMAP tools global
 )
 
 echo "#######################################"
 echo "# $0 finished"
 echo "#######################################"
 
-exec 2>&-
-exec 1>&-
-exit 0
-
+pkill -9 $$ && exit 0
index 62a2e77..d68094d 100755 (executable)
@@ -53,22 +53,17 @@ scp $YAML_BUILDS/tars/promenade-bundle-$SITE.tar $GENESIS_HOST:/tmp/
 ssh $GENESIS_HOST << EOF
   # TODO avoid following hard coding$
   route add -net 192.168.41.0/24 gw 192.168.2.1 bond0.41
-  mkdir -p /root/akraino/configs/promenade-bundle
-  mv /tmp/promenade-bundle-$SITE.tar /root/akraino/
+  mkdir -p /root/akraino
   cd /root/akraino/
+  cp /tmp/promenade-bundle-$SITE.tar .
   tar -xmf promenade-bundle-$SITE.tar
-  # MOVE TO LOCATION EXPECTED BY WORKFLOW
-  mv genesis.sh /root/akraino/configs/promenade-bundle/
+  mv configs/promenade-bundle/deploy_site.sh .
 EOF
 
 # Update BIOS settings on master and worker nodes
-python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml
+#python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml
 
 echo "#######################################"
 echo "# $0 finished"
 echo "#######################################"
-
-exec 2>&-
-exec 1>&-
-exit 0
-
+pkill -9 $$ && exit 0
index e958398..b604165 100755 (executable)
@@ -23,64 +23,25 @@ echo "logging to $LOGFILE"
 exec 1> >(tee -a $LOGFILE)
 exec 2>&1
 
-# Regional Server specific variables
-KEYSTONE_IMAGE=
-SHIPYARD_IMAGE=
 # Site specific variables
-DRYDOCK_PASSWORD=
-SHIPYARD_PASSWORD=
+export OS_AUTH_URL=
+export OS_USERNAME=shipyard
+export OS_PASSWORD=
 REGION_NAME=
 
+sleep 900
 
-clean_configdocs(){
-  ## clean site YAMLs from Deckhand
-  TOKEN=`sudo docker run --rm --net=host -e OS_AUTH_URL=http://keystone-api.ucp.svc.cluster.local:80/v3 -e OS_PROJECT_DOMAIN_NAME=default -e OS_USER_DOMAIN_NAME=default -e OS_PROJECT_NAME=service -e OS_REGION_NAME=RegionOne -e OS_USERNAME=drydock -e OS_PASSWORD=${DRYDOCK_PASSWORD} -e OS_IDENTITY_API_VERSION=3 ${KEYSTONE_IMAGE} openstack token issue -f value -c id`
-
-  curl -v -X DELETE -H "X-AUTH-TOKEN: $TOKEN" -H 'Content-Type: application/x-yaml' http://deckhand-int.ucp.svc.cluster.local:9000/api/v1.0/revisions
-}
-
-create_configdocs(){
-  sudo docker run -v $(pwd):/target -e 'OS_AUTH_URL=http://keystone-api.ucp.svc.cluster.local:80/v3' -e OS_PASSWORD=${SHIPYARD_PASSWORD} -e 'OS_PROJECT_DOMAIN_NAME=default' -e 'OS_PROJECT_NAME=service' -e 'OS_USERNAME=shipyard' -e 'OS_USER_DOMAIN_NAME=default' -e 'OS_IDENTITY_API_VERSION=3' --rm --net=host ${SHIPYARD_IMAGE} create configdocs ${REGION_NAME} --directory=/target/configs/promenade
-
-  sleep 5
-}
-
-renderedconfigdocs(){
-  sudo docker run -v $(pwd):/target -e 'OS_AUTH_URL=http://keystone-api.ucp.svc.cluster.local:80/v3' -e OS_PASSWORD=${SHIPYARD_PASSWORD} -e 'OS_PROJECT_DOMAIN_NAME=default' -e 'OS_PROJECT_NAME=service' -e 'OS_USERNAME=shipyard' -e 'OS_USER_DOMAIN_NAME=default' -e 'OS_IDENTITY_API_VERSION=3' --rm --net=host ${SHIPYARD_IMAGE} get renderedconfigdocs --committed > /tmp/renderedconfigdocs.yaml
-
-  sleep 5
-}
-
-commit_configdocs(){
-  sudo docker run -v $(pwd):/target -e 'OS_AUTH_URL=http://keystone-api.ucp.svc.cluster.local:80/v3' -e OS_PASSWORD=${SHIPYARD_PASSWORD} -e 'OS_PROJECT_DOMAIN_NAME=default' -e 'OS_PROJECT_NAME=service' -e 'OS_USERNAME=shipyard' -e 'OS_USER_DOMAIN_NAME=default' -e 'OS_IDENTITY_API_VERSION=3' --rm --net=host ${SHIPYARD_IMAGE} commit configdocs
-
-  sleep 5
-}
-
-deploy_site(){
-  sudo docker run -e 'OS_AUTH_URL=http://keystone-api.ucp.svc.cluster.local:80/v3' -e OS_PASSWORD=${SHIPYARD_PASSWORD} -e 'OS_PROJECT_DOMAIN_NAME=default' -e 'OS_PROJECT_NAME=service' -e 'OS_USERNAME=shipyard' -e 'OS_USER_DOMAIN_NAME=default' -e 'OS_IDENTITY_API_VERSION=3' --rm --net=host ${SHIPYARD_IMAGE} create action deploy_site
-}
-
-update_site(){
-  sudo docker run -e 'OS_AUTH_URL=http://keystone-api.ucp.svc.cluster.local:80/v3' -e OS_PASSWORD=${SHIPYARD_PASSWORD} -e 'OS_PROJECT_DOMAIN_NAME=default' -e 'OS_PROJECT_NAME=service' -e 'OS_USERNAME=shipyard' -e 'OS_USER_DOMAIN_NAME=default' -e 'OS_IDENTITY_API_VERSION=3' --rm --net=host ${SHIPYARD_IMAGE} create action update_site
-}
+tools/airship shipyard create configdocs ${REGION_NAME} --directory=/target/configs/promenade
 
+tools/airship shipyard commit configdocs
 
-getactions(){
-  sudo docker run -v $(pwd):/target -e 'OS_AUTH_URL=http://keystone-api.ucp.svc.cluster.local:80/v3' -e OS_PASSWORD=${SHIPYARD_PASSWORD} -e 'OS_PROJECT_DOMAIN_NAME=default' -e 'OS_PROJECT_NAME=service' -e 'OS_USERNAME=shipyard' -e 'OS_USER_DOMAIN_NAME=default' -e 'OS_IDENTITY_API_VERSION=3' --rm --net=host ${SHIPYARD_IMAGE} get actions
+tools/airship shipyard create action deploy_site
 
-  sleep 5
-}
+tools/airship shipyard get actions
 
-sleep 900
-clean_configdocs
-create_configdocs
-commit_configdocs
-renderedconfigdocs
+SHIPYARD_ACTION=$(tools/airship shipyard get actions | awk '/deploy_site/ {print $2};')
 
-deploy_site
-#getactions
-#update_site
+tools/airship shipyard describe $SHIPYARD_ACTION
 
 echo "## Airship deployment has been started..."
 echo "##"
index 13d36dc..111b603 100755 (executable)
@@ -37,9 +37,9 @@ echo "#######################################"
 sed -E 's/(^.*password:).*/\1 ###PASSWORD REMOVED####/g' ${YAML_BUILDS}/${SITE}.yaml
 echo "#######################################"
 
-echo "# NOTE: root ssh key will be used for genesis_ssh_public_key if no key is provided"
+echo "# NOTE: root ssh key will be used for genesis_ssh_public_key if no key in yaml"
 RCKEY=$(cat ~/.ssh/id_rsa.pub | sed -e 's/[\/&]/\\&/g')
-sed -i -e "s/genesis_ssh_public_key\: */genesis_ssh_public_key: \'$RCKEY\'/" $SITE.yaml
+sed -i -e "s/genesis_ssh_public_key\:\s*$/genesis_ssh_public_key: \'$RCKEY\'/" $SITE.yaml
 
 python ./scripts/jcopy.py $SITE.yaml ./tools/j2/set_site_env.sh ./tools/env_$SITE.sh
 source ./tools/env_$SITE.sh
index a91194b..aea1459 100644 (file)
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-export VERSION=0.0.2-SNAPSHOT
+export VERSION=1.0.1-SNAPSHOT